大屏接口中心成本修改

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/CenterCostController.java

@@ -35,9 +35,9 @@ public class CenterCostController extends ServiceController {
             @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
     })
     @PostMapping("/page")
-	public RestResult<Page<CenterCost>> getPage(CenterCost centerCost) {
+    public RestResult<Page<CenterCost>> getPage(CenterCost centerCost) {
         return success(centerCostService.page(getPage(), centerCost));
-	}
+    }
 
     @ApiOperation("查询 id 信息")
     @ApiImplicitParams({
@@ -53,23 +53,23 @@ public class CenterCostController extends ServiceController {
             @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
     })
     @PutMapping("/{id}")
-	public RestResult<Boolean> edit(@PathVariable("id") Long id, CenterCost centerCost) {
+    public RestResult<Boolean> edit(@PathVariable("id") Long id, CenterCost centerCost) {
         centerCost.setId(id);
-        return success(centerCostService.update(centerCost));
-	}
+        return success(centerCostService.updateData(centerCost, getAccount()));
+    }
 
     @ApiOperation("添加")
     @PostMapping("/")
-	public RestResult<Boolean> add(CenterCost centerCost) {
-        return success(centerCostService.save(centerCost));
-	}
+    public RestResult<Boolean> add(CenterCost centerCost) {
+        return success(centerCostService.saveData(centerCost, getAccount()));
+    }
 
     @ApiOperation("根据 ids 删除")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
     })
-	@DeleteMapping("/")
-	public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
+    @DeleteMapping("/")
+    public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
         return success(centerCostService.removeByIds(ids));
-	}
+    }
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/ICenterCostService.java

 package com.patzn.cloud.service.lims.hmhj.service;
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.service.IBaseService;
 import com.patzn.cloud.service.hmhj.entity.CenterCost;
 
@@ -18,5 +19,7 @@ public interface ICenterCostService extends IBaseService<CenterCost> {
 
     boolean removeByIds(List<Long> ids);
 
-    boolean update(CenterCost centerCost);
+    boolean saveData(CenterCost centerCost,Account account);
+
+    boolean updateData(CenterCost centerCost, Account account);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/CenterCostServiceImpl.java

 package com.patzn.cloud.service.lims.hmhj.service.impl;
 
+import com.baomidou.mybatisplus.mapper.Condition;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.patzn.cloud.commons.controller.LoginHelper;
+import com.patzn.cloud.commons.api.RestAssert;
+import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import com.patzn.cloud.service.hmhj.entity.CenterCost;
 import com.patzn.cloud.service.hmhj.entity.CenterCostRecord;
@@ -31,11 +33,14 @@ public class CenterCostServiceImpl extends BaseServiceImpl<CenterCostMapper, Cen
     @Autowired
     private ICenterCostRecordService centerCostRecordService;
 
-
     @Override
     public Page<CenterCost> page(Page<CenterCost> page, CenterCost centerCost) {
+        String category = centerCost.getCategory();
+        centerCost.setCategory(null);
         Wrapper wrapper = new EntityWrapper<>(centerCost);
-
+        if (StringUtils.isNotBlank(category)) {
+            wrapper.like("category", category);
+        }
         return this.page(page, wrapper);
     }
 
@@ -45,7 +50,27 @@ public class CenterCostServiceImpl extends BaseServiceImpl<CenterCostMapper, Cen
     }
 
     @Override
-    public boolean update(CenterCost centerCost) {
+    public boolean saveData(CenterCost centerCost, Account account) {
+        RestAssert.fail(StringUtils.isBlank(centerCost.getYear()), "请选择年度!");
+        RestAssert.fail(StringUtils.isBlank(centerCost.getCategory()), "请选择科室!");
+        yearHandler(centerCost);
+        Integer dbCount = count(Condition.<CenterCost>wrapper().eq("year", centerCost.getYear()).eq("category", centerCost.getCategory()));
+        RestAssert.fail(dbCount > 0, String.format("系统中已存在【%s-%s】年度成本信息!", centerCost.getCategory(), centerCost.getYear()));
+        return super.save(centerCost);
+    }
+
+    private static void yearHandler(CenterCost centerCost) {
+        String year = centerCost.getYear();
+        if (StringUtils.isNotBlank(year)) {
+            year = year.substring(0, 4);
+        }
+        centerCost.setYear(year);
+    }
+
+    @Override
+    public boolean updateData(CenterCost centerCost, Account account) {
+        RestAssert.fail(StringUtils.isBlank(centerCost.getYear()), "请选择年度!");
+        RestAssert.fail(StringUtils.isBlank(centerCost.getCategory()), "请选择科室!");
         /* 更新时添加对比信息 */
         CenterCost ccInDB = this.getById(centerCost.getId());
         String remark = lmsPropertyService.getCompareDifferent(centerCost, ccInDB, "中心成本对比", "修改信息：");
@@ -53,11 +78,11 @@ public class CenterCostServiceImpl extends BaseServiceImpl<CenterCostMapper, Cen
             CenterCostRecord record = new CenterCostRecord();
             record.setCenterCostId(centerCost.getId());
             record.setRemark(remark);
-            record.setOperator(LoginHelper.getAccount().getUserName());
-            record.setOperatorId(LoginHelper.getAccount().getUserId());
+            record.setOperator(account.getUserName());
+            record.setOperatorId(account.getUserId());
             centerCostRecordService.save(record);
         }
-
+        yearHandler(centerCost);
         return super.updateById(centerCost);
     }
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/StatisticsServiceImpl.java

@@ -281,6 +281,10 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta
         // 跨服务查询出库信息
         WmsInventoryDTO dto = new WmsInventoryDTO();
         dto.setType("年入库");
+        // 设置预留字段1为：科室【化验，衡量，质检】
+        dto.setReservedFields1(queryDTO.getType());
+        // 年度预留字段2为：今年或者某年【2023】
+        dto.setReservedFields2(queryDTO.getYear());
         List<WmsInventory> inventoryList = getInventoryList(dto);
         if (CollectionUtils.isNotEmpty(inventoryList)) {
             BigDecimal consume = inventoryList.stream()
@@ -315,8 +319,16 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta
             map.put("Unit", dto.getUnit());
         }
 
+        if (StringUtils.isNotBlank(dto.getReservedFields1())) {
+            map.put("ReservedFields1", dto.getReservedFields1());
+        }
+
+        if (StringUtils.isNotBlank(dto.getReservedFields2())) {
+            map.put("ReservedFields2", dto.getReservedFields2());
+        }
+
         // 若为开发环境，模拟测试数据
-        if (isProd()) {
+        if (!isProd()) {
             dataList = getMockData();
             return dataList.stream().filter(d -> {
                 boolean f = true;

src/main/resources/mapper/hmhj/StatisticsMapper.xml

@@ -974,6 +974,9 @@
         <if test="null != vo.year">
             and c.year = #{vo.year}
         </if>
+        <if test="null != vo.type">
+            and c.category = #{vo.type}
+        </if>
     </select>
 
 </mapper>

src/test/java/resources/db_sql/hmhj/霍煤4月运维/20230427__新增中心成本科室字段.sql

+/** meazty created 【中心成本科室】 at 2023/4/20 14:55 **/
+/** meazty created 【中心成本科室】 at 2023/4/20 14:55 **/
+ALTER TABLE public.center_cost ADD category varchar(64) NULL;
+COMMENT ON COLUMN public.center_cost.category IS '科室';