Merge remote-tracking branch 'origin/master'

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceDefinitionController.java

@@ -2,6 +2,8 @@ package com.jpsoft.picc.modules.base.controller;
 
 import com.github.pagehelper.Page;
 import com.jpsoft.picc.modules.base.entity.InsuranceDefinition;
+import com.jpsoft.picc.modules.base.entity.InsuranceDefinitionLimit;
+import com.jpsoft.picc.modules.base.service.InsuranceDefinitionLimitService;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
@@ -27,6 +29,9 @@ public class InsuranceDefinitionController {
     @Autowired
     private InsuranceDefinitionService insuranceDefinitionService;
 
+    @Autowired
+    private InsuranceDefinitionLimitService insuranceDefinitionLimitService;
+
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
     public MessageResult<InsuranceDefinition> create(){
@@ -140,6 +145,15 @@ public class InsuranceDefinitionController {
             int affectCount = insuranceDefinitionService.update(insuranceDefinition);
 
             if (affectCount > 0) {
+
+                List<InsuranceDefinitionLimit> insuranceDefinitionLimitList = insuranceDefinitionLimitService.findByDefinitionId(insuranceDefinition.getId());
+                for (InsuranceDefinitionLimit insuranceDefinitionLimit:insuranceDefinitionLimitList) {
+                    insuranceDefinitionLimit.setDelFlag(true);
+                    insuranceDefinitionLimit.setUpdateBy(subject);
+                    insuranceDefinitionLimit.setUpdateTime(new Date());
+                    insuranceDefinitionLimitService.update(insuranceDefinitionLimit);
+                }
+
                 msgResult.setResult(true);
                 msgResult.setData(affectCount);
             } else {
@@ -173,6 +187,16 @@ public class InsuranceDefinitionController {
                 insuranceDefinition.setUpdateTime(new Date());
 
                 affectCount += insuranceDefinitionService.update(insuranceDefinition);
+
+                //如果下面有限额，限额一并删除
+                List<InsuranceDefinitionLimit> insuranceDefinitionLimitList = insuranceDefinitionLimitService.findByDefinitionId(insuranceDefinition.getId());
+
+                for (InsuranceDefinitionLimit insuranceDefinitionLimit:insuranceDefinitionLimitList) {
+                    insuranceDefinitionLimit.setDelFlag(true);
+                    insuranceDefinitionLimit.setUpdateBy(subject);
+                    insuranceDefinitionLimit.setUpdateTime(new Date());
+                    insuranceDefinitionLimitService.update(insuranceDefinitionLimit);
+                }
             }
 
             if (affectCount > 0) {