feat(开通业务)：1.新增监管端废弃接口

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgReformNoticeServiceImpl.java

@@ -452,7 +452,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                     TaskResultDTO dto = new TaskResultDTO();
                     dto.setResultCode("approvalStatus");
                     dto.setTaskId(taskId);
-                    dto.setComment("提交流程");
+                    dto.setComment("");
                     HashMap<String, Object> map = new HashMap<>();
                     map.put("approvalStatus", "0");
                     dto.setVariable(map);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java

@@ -76,9 +76,10 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@ApiOperation(httpMethod = "PUT", value = "保存并提交", notes = "保存并提交")
 	public ResponseModel<JyjcOpeningApplicationModel> updateBySequenceNbrAndStartFlow(@RequestBody JyjcOpeningApplicationModel model, @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
 		model.setSequenceNbr(sequenceNbr);
-		// if (ValidationUtil.isEmpty(model.getBaseUnitLicences()) || ValidationUtil.isEmpty(model.getUserInfos())) {
-		// 	throw new BadRequest("企业资质信息和检验人员信息为空，无法提交！");
-		// }
+		JyjcOpeningApplicationModel jyjcOpeningApplicationModel = jyjcOpeningApplicationServiceImpl.queryDetail(sequenceNbr);
+		if (jyjcOpeningApplicationModel == null || ValidationUtil.isEmpty(jyjcOpeningApplicationModel.getBaseUnitLicences()) || ValidationUtil.isEmpty(jyjcOpeningApplicationModel.getUserInfos())) {
+			throw new BadRequest("企业资质信息和检验人员信息为空，无法提交！");
+		}
 		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model,true));
 	}
 
@@ -246,4 +247,23 @@ public class JyjcOpeningApplicationController extends BaseController {
 	public ResponseModel<List<TzBaseEnterpriseInfo>> getInspectionUnitList() {
 		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.getInspectionUnitList());
 	}
+
+	/**
+	 * 作废
+	 *
+	 *
+	 * @param
+	 * @return {@link  ResponseModel< List< TzBaseEnterpriseInfo>>}
+	 * @author yangyang
+	 * @throws
+	 * @date 2023/12/22 16:13
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/discard")
+	@ApiOperation(httpMethod = "PUT", value = "作废", notes = "作废")
+	public ResponseModel<Boolean> doDiscard(@RequestBody Map<String,Object> params) {
+		String sequenceNbr = (String) params.get("sequenceNbr");
+		String remark = (String) params.get("remark");
+		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.doDiscard(Long.parseLong(sequenceNbr), remark));
+	}
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -236,6 +236,26 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         return this.update(updateWrapper);
     }
 
+    public Boolean doDiscard(Long sequenceNbr, String remark) {
+        if (sequenceNbr == null) {
+            throw new BadRequest("sequenceNbr不能为空！");
+        }
+        JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationMapper.selectById(sequenceNbr);
+        if (jyjcOpeningApplication == null) {
+            return false;
+        }
+        if (!String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()).equals(jyjcOpeningApplication.getStatus())) {
+            throw new BadRequest("只有已完成的申请单才可以作废！");
+        }
+        UpdateWrapper<JyjcOpeningApplication> updateWrapper = new UpdateWrapper<>();
+        updateWrapper
+                .set("status", FlowStatusEnum.TO_BE_DISCARD.getCode())
+                .set("status_name", FlowStatusEnum.TO_BE_DISCARD.getName())
+                .set("remark", remark)
+                .eq("SEQUENCE_NBR", sequenceNbr);
+        return this.update(updateWrapper);
+    }
+
 
     /**
      * 分页查询