feat(jg):维修告知作废

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgMaintainNoticeDto.java

@@ -233,4 +233,13 @@ public class JgMaintainNoticeDto extends BaseDto {
 
     @ApiModelProperty("工程装置")
     private String projectContraption;
+
+    @ApiModelProperty("作废原因")
+    private String cancelReason;
+
+    @ApiModelProperty("作废日期")
+    private Date cancelDate;
+
+    @ApiModelProperty("作废人员id")
+    private String cancelUserId;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgMaintainNotice.java

@@ -8,6 +8,8 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 维修告知
@@ -366,4 +368,28 @@ public class JgMaintainNotice extends BaseEntity {
      */
     @TableField("project_contraption")
     private String projectContraption;
+
+    /**
+     * 告知设备列表
+     */
+    @TableField(exist = false)
+    private List<Map<String, Object>> deviceList;
+
+    /**
+     * 作废原因
+     */
+    @TableField("cancel_reason")
+    private String cancelReason;
+
+    /**
+     * 作废日期
+     */
+    @TableField("cancel_date")
+    private Date cancelDate;
+
+    /**
+     * 作废人员id
+     */
+    @TableField("cancel_user_id")
+    private String cancelUserId;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgMaintainNoticeService.java

@@ -61,4 +61,12 @@ public interface IJgMaintainNoticeService extends IService<JgMaintainNotice> {
     void generateMaintainNoticeReport(Long sequenceNbr,HttpServletResponse response);
 
     boolean deleteBySequenceNbr(Long[] sequenceNbr);
+
+    /**
+     * 作废申请
+     * @param sequenceNbr 业务唯一标识
+     * @param cancelReason 作废原因
+     * @return JgInstallationNoticeDto
+     */
+    JgMaintainNotice cancelApplication(Long sequenceNbr, String cancelReason, Map<String, Object> model);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintainNoticeMapper.xml

@@ -67,6 +67,7 @@
         isn.create_user_company_name AS createUserCompanyName,
         isn.next_execute_user_ids AS nextExecuteUserIds,
         isn.transfer_to_user_ids AS transferToUserIds,
+        isn.cancel_reason AS cancelReason,
         (SELECT name from tz_equipment_category ec WHERE ec.code = isn.equ_list_code) AS equListName,
         DATE_FORMAT(isn.create_date,'%Y-%m-%d') AS createDate,
         (select name from tz_equipment_category ec WHERE ec.code = isn.equ_category) AS equCategoryName

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgMaintainNoticeController.java

@@ -144,4 +144,12 @@ public class JgMaintainNoticeController extends BaseController {
     public void generateReport(HttpServletResponse response, @RequestParam("sequenceNbr") Long sequenceNbr) {
         iJgMaintainNoticeService.generateMaintainNoticeReport(sequenceNbr,response);
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "PUT", value = "维修告知单个作废", notes = "维修告知单个作废")
+    @PutMapping(value = "/cancel/application")
+    public ResponseModel<JgMaintainNotice> cancelApplication(@RequestBody Map<String, Object> model) {
+        JgMaintainNotice result = iJgMaintainNoticeService.cancelApplication(Long.parseLong((String) model.get("sequenceNbr")), (String) model.get("cancelReason"), model);
+        return ResponseHelper.buildResponse(result);
+    }
 }