Merge branch 'chenhao' into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IDutyCommonService.java

@@ -61,7 +61,7 @@ public interface IDutyCommonService {
      * @param instanceId 实例id
      * @return Boolean
      */
-    Boolean deleteDutyData(Long instanceId);
+    Boolean deleteDutyData(Long instanceId, String startTime, String endTime);
 
     /**
      * 查询指定条件的值班人信息

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireTeamMapper.xml

@@ -73,12 +73,13 @@
     </select>
 
     <!--消防队伍列表按时间倒叙排列order by x.rec_date desc 2021-09-08 by kongfm -->
+    <!--BUG 2846 最初开发人员在动态语句后加入分号导致错误  2021-09-10 by kongfm -->
     <select id="listFireTeamById" resultType="com.yeejoin.amos.boot.module.common.api.entity.FireTeam">
         SELECT *
         FROM cb_fire_team
         WHERE is_delete = 0
         <if test="teamId != null">
-            AND tree_code LIKE CONCAT((SELECT tree_code FROM cb_fire_team WHERE sequence_nbr = #{teamId}),'%');
+            AND tree_code LIKE CONCAT((SELECT tree_code FROM cb_fire_team WHERE sequence_nbr = #{teamId}),'%')
         </if>
         order by cb_fire_team.rec_date desc
     </select>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyCarController.java

@@ -11,7 +11,9 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -127,13 +129,21 @@ public class DutyCarController extends BaseController {
      * 值班数据删除
      *
      * @param instanceId 实例id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
      * @return ResponseModel
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping("/{instanceId}")
     @ApiOperation(httpMethod = "DELETE", value = "值班数据删除", notes = "值班数据删除")
-    public ResponseModel deleteDutyData(@PathVariable Long instanceId) {
-        return ResponseHelper.buildResponse(iDutyCarService.deleteDutyData(instanceId));
+    public ResponseModel deleteDutyData(@PathVariable Long instanceId,@PathVariable String startTime,@PathVariable String endTime) {
+        if (ValidationUtil.isEmpty(instanceId)
+                || ValidationUtil.isEmpty(startTime)
+                || ValidationUtil.isEmpty(endTime)){
+            throw new BadRequest("参数校验失败.");
+        }
+        // BUG 2807 删除逻辑缺陷，现在前端后端传入 删除月份 2021-09-10 by kongfm
+        return ResponseHelper.buildResponse(iDutyCarService.deleteDutyData(instanceId, startTime, endTime));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyPersonController.java

@@ -11,7 +11,9 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -116,13 +118,21 @@ public class DutyPersonController extends BaseController {
      * 值班数据删除
      *
      * @param instanceId 实例id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
      * @return ResponseModel
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping("/{instanceId}")
+    @DeleteMapping("/{instanceId}/{startTime}/{endTime}")
     @ApiOperation(httpMethod = "DELETE", value = "值班数据删除", notes = "值班数据删除")
-    public ResponseModel deleteDutyData(@PathVariable Long instanceId) {
-        return ResponseHelper.buildResponse(iDutyPersonService.deleteDutyData(instanceId));
+    public ResponseModel deleteDutyData(@PathVariable Long instanceId,@PathVariable String startTime,@PathVariable String endTime) {
+        if (ValidationUtil.isEmpty(instanceId)
+                || ValidationUtil.isEmpty(startTime)
+                || ValidationUtil.isEmpty(endTime)){
+            throw new BadRequest("参数校验失败.");
+        }
+        // BUG 2807 删除逻辑缺陷，现在前端后端传入 删除月份 2021-09-10 by kongfm
+        return ResponseHelper.buildResponse(iDutyPersonService.deleteDutyData(instanceId, startTime, endTime));
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCommonServiceImpl.java

@@ -326,14 +326,11 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 	}
 
 	@Override
-	public Boolean deleteDutyData(Long instanceId) {
-		// 一个人共用一个 instanceId
-
-
-		dynamicFormInstanceService.remove(
-				new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId, instanceId));
+	public Boolean deleteDutyData(Long instanceId, String startTime, String endTime) {
+        // BUG 2807 删除逻辑缺陷，现在前端后端传入 删除月份 2021-09-10 by kongfm
+		//dynamicFormInstanceService.remove(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId, instanceId));
 		dutyPersonShiftService
-				.remove(new LambdaQueryWrapper<DutyPersonShift>().eq(DutyPersonShift::getInstanceId, instanceId));
+				.remove(new LambdaQueryWrapper<DutyPersonShift>().ge(DutyPersonShift::getDutyDate,startTime).le(DutyPersonShift::getDutyDate,endTime).eq(DutyPersonShift::getInstanceId, instanceId));
 		return true;
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FireTeamController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -87,6 +88,13 @@ public class FireTeamController extends BaseController {
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改消防队伍", notes = "修改消防队伍")
     public ResponseModel<Object> updateByIdFireTeam(HttpServletRequest request, @RequestBody FireTeam fireTeam) {
+        if (ValidationUtil.isEmpty(fireTeam.getSequenceNbr())){
+            throw new BadRequest("更新消防队伍必须传入主键");
+        }
+        // BUG 2842  由 BUG2217 2684 新增业务 需要统计消防队伍旗下所有消防队伍信息导致数据逻辑错误 返回错误提示 2021-09-10 by kongfm
+        if(fireTeam.getSequenceNbr().equals(fireTeam.getParent())) {
+            throw new BadRequest("消防队伍上级不可选为自己");
+        }
         return ResponseHelper.buildResponse(iFireTeamService.saveFireTeam(fireTeam));
     }