优化代码

service-common/src/main/java/com/java110/common/api/AttendanceClassApi.java

@@ -183,12 +183,17 @@ public class AttendanceClassApi {
     public ResponseEntity<String> updateAttendanceClassesTaskDetail(@RequestBody JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "taskId", "请求报文中未包含taskId");
-        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
         Assert.hasKeyAndValue(reqJson, "detailId", "detailId不能为空");
 
+        boolean finishAllTaskDetail = false;
+
+        if(reqJson.containsKey("finishAllTaskDetail") && reqJson.getBoolean("finishAllTaskDetail")){
+            finishAllTaskDetail = true;
+        }
+
 
         AttendanceClassesTaskDetailPo attendanceClassesTaskDetailPo = BeanConvertUtil.covertBean(reqJson, AttendanceClassesTaskDetailPo.class);
-        return updateAttendanceClassesTaskDetailBMOImpl.update(attendanceClassesTaskDetailPo);
+        return updateAttendanceClassesTaskDetailBMOImpl.update(attendanceClassesTaskDetailPo,finishAllTaskDetail);
     }
 
     /**

service-common/src/main/java/com/java110/common/bmo/attendanceClassesTask/impl/SaveAttendanceClassesTaskBMOImpl.java

@@ -2,11 +2,13 @@ package com.java110.common.bmo.attendanceClassesTask.impl;
 
 import com.java110.common.bmo.attendanceClassesTask.ISaveAttendanceClassesTaskBMO;
 import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.attendanceClasses.AttendanceClassesDto;
+import com.java110.intf.common.IAttendanceClassesInnerServiceSMO;
 import com.java110.intf.common.IAttendanceClassesTaskDetailInnerServiceSMO;
 import com.java110.intf.common.IAttendanceClassesTaskInnerServiceSMO;
 import com.java110.po.attendanceClassesTask.AttendanceClassesTaskPo;
 import com.java110.po.attendanceClassesTaskDetail.AttendanceClassesTaskDetailPo;
+import com.java110.utils.util.Assert;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -22,6 +24,8 @@ public class SaveAttendanceClassesTaskBMOImpl implements ISaveAttendanceClassesT
 
     @Autowired
     private IAttendanceClassesTaskDetailInnerServiceSMO attendanceClassesTaskDetailInnerServiceSMOImpl;
+    @Autowired
+    private IAttendanceClassesInnerServiceSMO attendanceClassesInnerServiceSMOImpl;
 
     /**
      * 添加小区信息
@@ -34,9 +38,17 @@ public class SaveAttendanceClassesTaskBMOImpl implements ISaveAttendanceClassesT
                                        List<AttendanceClassesTaskDetailPo> attendanceClassesTaskDetailPos) {
 
         //attendanceClassesTaskPo.setTaskId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskId));
+        //查询班组是否存在
+        AttendanceClassesDto attendanceClassesDto = new AttendanceClassesDto();
+        attendanceClassesDto.setClassesId(attendanceClassesTaskPo.getClassId());
+        List<AttendanceClassesDto> attendanceClassesDtos = attendanceClassesInnerServiceSMOImpl.queryAttendanceClassess(attendanceClassesDto);
+
+        Assert.listOnlyOne(attendanceClassesDtos, "班组不存在");
+
+        attendanceClassesTaskPo.setStoreId(attendanceClassesDtos.get(0).getStoreId());
         int flag = attendanceClassesTaskInnerServiceSMOImpl.saveAttendanceClassesTask(attendanceClassesTaskPo);
 
-        for(AttendanceClassesTaskDetailPo attendanceClassesTaskDetailPo : attendanceClassesTaskDetailPos){
+        for (AttendanceClassesTaskDetailPo attendanceClassesTaskDetailPo : attendanceClassesTaskDetailPos) {
             attendanceClassesTaskDetailInnerServiceSMOImpl.saveAttendanceClassesTaskDetail(attendanceClassesTaskDetailPo);
         }
 

service-common/src/main/java/com/java110/common/bmo/attendanceClassesTaskDetail/IUpdateAttendanceClassesTaskDetailBMO.java

@@ -13,7 +13,7 @@ public interface IUpdateAttendanceClassesTaskDetailBMO {
      * @param attendanceClassesTaskDetailPo
      * @return
      */
-    ResponseEntity<String> update(AttendanceClassesTaskDetailPo attendanceClassesTaskDetailPo);
+    ResponseEntity<String> update(AttendanceClassesTaskDetailPo attendanceClassesTaskDetailPo,boolean finishAllTaskDetail);
 
 
 }

service-common/src/main/java/com/java110/common/bmo/attendanceClassesTaskDetail/impl/UpdateAttendanceClassesTaskDetailBMOImpl.java

@@ -3,6 +3,8 @@ package com.java110.common.bmo.attendanceClassesTaskDetail.impl;
 import com.java110.common.bmo.attendanceClassesTaskDetail.IUpdateAttendanceClassesTaskDetailBMO;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.intf.common.IAttendanceClassesTaskDetailInnerServiceSMO;
+import com.java110.intf.common.IAttendanceClassesTaskInnerServiceSMO;
+import com.java110.po.attendanceClassesTask.AttendanceClassesTaskPo;
 import com.java110.po.attendanceClassesTaskDetail.AttendanceClassesTaskDetailPo;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,20 +17,34 @@ public class UpdateAttendanceClassesTaskDetailBMOImpl implements IUpdateAttendan
     @Autowired
     private IAttendanceClassesTaskDetailInnerServiceSMO attendanceClassesTaskDetailInnerServiceSMOImpl;
 
+
+    @Autowired
+    private IAttendanceClassesTaskInnerServiceSMO attendanceClassesTaskInnerServiceSMOImpl;
+
     /**
      * @param attendanceClassesTaskDetailPo
      * @return 订单服务能够接受的报文
      */
     @Java110Transactional
-    public ResponseEntity<String> update(AttendanceClassesTaskDetailPo attendanceClassesTaskDetailPo) {
+    public ResponseEntity<String> update(AttendanceClassesTaskDetailPo attendanceClassesTaskDetailPo, boolean finishAllTaskDetail) {
 
         int flag = attendanceClassesTaskDetailInnerServiceSMOImpl.updateAttendanceClassesTaskDetail(attendanceClassesTaskDetailPo);
 
-        if (flag > 0) {
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        if (flag < 1) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+
         }
 
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+        if (finishAllTaskDetail) {
+            AttendanceClassesTaskPo attendanceClassesTaskPo = new AttendanceClassesTaskPo();
+            attendanceClassesTaskPo.setTaskId(attendanceClassesTaskDetailPo.getTaskId());
+            attendanceClassesTaskPo.setState("30000");
+            attendanceClassesTaskPo.setStatusCd("0");
+            attendanceClassesTaskInnerServiceSMOImpl.updateAttendanceClassesTask(attendanceClassesTaskPo);
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+
     }
 
 }