修改逻辑查询和responsibilityCodes

src/main/java/com/imed/costaccount/model/CostIncomeGroupSet.java

@@ -52,7 +52,7 @@ public class CostIncomeGroupSet implements Serializable {
 	 * 责任中心的代码
 	 */
 	@TableField(updateStrategy = FieldStrategy.IGNORED)
-	private String responsibilityCode;
+	private String responsibilityCodes;
 	/**
 	 * 排除的成本科目的Id ,拼接
 	 */

src/main/java/com/imed/costaccount/model/dto/CostIncomeGroupSetSaveDto.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -22,7 +21,6 @@ public class CostIncomeGroupSetSaveDto {
 
     @ApiModelProperty(name = "openDepartmentProportion", value = "开单科室的比例")
     @NotNull(message = "开单科室比例不能为空")
-    @Max(100L)
     private Integer openDepartmentProportion;
 
     @ApiModelProperty(name = "startDepartmentStatus", value = "执行科室状态 1 收入中心 2 成本中心")
@@ -31,10 +29,9 @@ public class CostIncomeGroupSetSaveDto {
     private Integer startDepartmentStatus;
 
     @ApiModelProperty(name = "startDepartmentStatus", value = "执行科室的比例")
-    @Max(100L)
     private Integer startDepartmentProportion;
 
     @ApiModelProperty(name = "responsibilityCode", value = "责任中心的代码")
-    private String responsibilityCode;
+    private String responsibilityCodes;
 
 }

src/main/java/com/imed/costaccount/model/vo/CostIncomeGroupSetVO.java

@@ -36,4 +36,8 @@ public class CostIncomeGroupSetVO {
     @ApiModelProperty(name = "responsibilityName",value = "责任中心的名称")
     @JsonInclude(value = JsonInclude.Include.NON_NULL)
     private String responsibilityName;
+    /**
+     * 是否显示排除其他科室按钮
+     */
+    private Integer accountStatus;
 }

src/main/java/com/imed/costaccount/service/impl/CostIncomeGroupServiceImpl.java

@@ -15,6 +15,7 @@ import com.imed.costaccount.service.*;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -32,14 +33,12 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
 
     private final AccountingService accountingService;
 
-    private final CostIncomeGroupMapper costIncomeGroupMapper;
 
-    public CostIncomeGroupServiceImpl(DepartmentService departmentService, ResponsibilityService responsibilityService, ProductService productService, AccountingService accountingService, CostIncomeGroupMapper costIncomeGroupMapper) {
+    public CostIncomeGroupServiceImpl(DepartmentService departmentService, ResponsibilityService responsibilityService, ProductService productService, AccountingService accountingService) {
         this.departmentService = departmentService;
         this.responsibilityService = responsibilityService;
         this.productService = productService;
         this.accountingService = accountingService;
-        this.costIncomeGroupMapper = costIncomeGroupMapper;
     }
 
     /**
@@ -62,37 +61,30 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
         wrapper.eq("hosp_id",hospId);
         wrapper.eq("date_year",year);
         wrapper.eq("date_month",month);
+        wrapper.like(!StringUtils.isEmpty(responsibilityCode),"open_responsibility_code",responsibilityCode)
+                .or()
+                .like(!StringUtils.isEmpty(responsibilityCode),"start_responsibility_code",responsibilityCode);
+        wrapper.eq(!StringUtils.isEmpty(accountCode),"account_code",accountCode);
         Page<CostIncomeGroup> pages = this.page(costIncomeGroupPage, wrapper);
         List<CostIncomeGroup> records = pages.getRecords();
         List<CostIncomeGroupBeforeVO> costIncomeGroupBeforeVOList = BeanUtil.convertList(records, CostIncomeGroupBeforeVO.class);
         // 查询所有的责任中心 科室 会计科目  成本项目的数据  处理名字
         setCodeName(hospId, costIncomeGroupBeforeVOList);
         // 进行金额合并
-        List<CostIncomeGroupAllAmountVO> costIncomeGroupAllAmountVoS =costIncomeGroupMapper.countMoney(costIncomeGroupBeforeVOList);
-        // TODO 对,的金额进行合并
+        List<CostIncomeGroupAllAmountVO> costIncomeGroupAllAmountVoS =baseMapper.countMoney(costIncomeGroupBeforeVOList);
+        //  对,的金额进行合并
         costIncomeGroupAllAmountVoS.forEach(i->{
             String allMoney = i.getAllMoney();
             if (allMoney.contains(StrUtil.COMMA)){
                 // 存在，在进行求和
-                Long sum;
+                long sum;
                 List<Long> list = Arrays.stream(allMoney.split(StrUtil.COMMA)).map(Long::valueOf).collect(Collectors.toList());
-
+                sum = list.stream().mapToLong(m -> m).sum();
+                i.setAmount(BigDecimal.valueOf(sum));
             }
         });
-        List<CostIncomeGroupAllAmountVO> amountVOS = costIncomeGroupAllAmountVoS.stream().map(i -> {
-            if (!StringUtils.isEmpty(responsibilityCode)) {
-                boolean equalsBoolean = i.getOpenResponsibilityCode().equals(responsibilityCode);
-                if (!equalsBoolean) {
-                    i.getStartResponsibilityCode().equals(responsibilityCode);
-                }
-            }
-            if (!StringUtils.isEmpty(accountCode)) {
-                i.getAccountCode().equals(accountCode);
-            }
-            return i;
-        }).collect(Collectors.toList());
         PageUtils pageUtils = new PageUtils(pages);
-        pageUtils.setList(amountVOS);
+        pageUtils.setList(costIncomeGroupAllAmountVoS);
         return pageUtils;
     }
 

src/main/java/com/imed/costaccount/service/impl/CostIncomeGroupSetServiceImpl.java

@@ -65,6 +65,11 @@ public class CostIncomeGroupSetServiceImpl extends ServiceImpl<CostIncomeGroupSe
                         i.setResponsibilityName(responsibilities.get(0).getResponsibilityName());
                     }
                 }
+                if (NumberConstant.ONE.equals(i.getOpenDepartmentStatus()) && NumberConstant.ONE.equals(i.getStartDepartmentStatus())){
+                    i.setAccountStatus(NumberConstant.ONE);
+                }else {
+                    i.setAccountStatus(NumberConstant.ZERO);
+                }
             });
         }
         PageUtils pageUtils = new PageUtils(pages);
@@ -129,14 +134,14 @@ public class CostIncomeGroupSetServiceImpl extends ServiceImpl<CostIncomeGroupSe
         }
         if (NumberConstant.TWO.equals(costIncomeGroupSetSaveDto.getOpenDepartmentStatus())
                 && NumberConstant.TWO.equals(costIncomeGroupSetSaveDto.getStartDepartmentStatus())) {
-            if (StringUtils.isEmpty(costIncomeGroupSetSaveDto.getResponsibilityCode())){
+            if (StringUtils.isEmpty(costIncomeGroupSetSaveDto.getResponsibilityCodes())){
                 throw new CostException(500, "两个成本中心需要输入对应的责任中心");
             }else {
                 costIncomeGroupSetSaveDto.setOpenDepartmentProportion(NumberConstant.ZERO);
                 costIncomeGroupSetSaveDto.setStartDepartmentProportion(NumberConstant.ZERO);
             }
         }
-        if (!StringUtils.isEmpty(costIncomeGroupSetSaveDto.getResponsibilityCode())){
+        if (!StringUtils.isEmpty(costIncomeGroupSetSaveDto.getResponsibilityCodes())){
             if (NumberConstant.ONE.equals(costIncomeGroupSetSaveDto.getOpenDepartmentStatus()) ||
                 NumberConstant.ONE.equals(costIncomeGroupSetSaveDto.getStartDepartmentStatus())){
                 throw new CostException(500,"存在收益中心 不允许设置责任中心");
@@ -185,7 +190,7 @@ public class CostIncomeGroupSetServiceImpl extends ServiceImpl<CostIncomeGroupSe
         CostIncomeGroupSet incomeGroupSet = BeanUtil.convertObj(costIncomeGroupSetSaveDto, CostIncomeGroupSet.class);
         incomeGroupSet.setHospId(hospId);
         incomeGroupSet.setCreateTime(System.currentTimeMillis());
-        incomeGroupSet.setResponsibilityCode(costIncomeGroupSetSaveDto.getResponsibilityCode());
+        incomeGroupSet.setResponsibilityCodes(costIncomeGroupSetSaveDto.getResponsibilityCodes());
         incomeGroupSet.setAccountCode(costIncomeGroupSet.getAccountCode());
         baseMapper.insert(incomeGroupSet);
     }

src/main/resources/mapper/CostIncomeGroupSetMapper.xml

@@ -11,7 +11,7 @@
         <result property="startDepartmentStatus" column="start_department_status"/>
         <result property="startDepartmentProportion" column="start_department_proportion"/>
         <result property="hospId" column="hosp_id"/>
-        <result property="responsibilityCode" column="responsibility_code"/>
+        <result property="responsibilityCodes" column="responsibility_codes"/>
         <result property="accountCode" column="account_code"/>
         <result property="createTime" column="create_time"/>
         <result property="deleteTime" column="delete_time"/>