Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -214,6 +214,12 @@ public class JgMaintenanceContract extends BaseEntity {
     private String createUserId;
 
     /**
+     * 创建人名称
+     */
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
      * 创建时间
      */
 	@TableField("create_date")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/WorkFlowStatusEnum.java

@@ -25,7 +25,7 @@ public enum WorkFlowStatusEnum {
 
 
     /**
-     * 维保流程
+     * 维保备案
      */
     MAIN_SUBMIT("使用单位提交", "mainSubmit", "使用单位待提交", "维保单位已驳回", "使用单位已撤回"),
     MAIN_RECEIVE("维保单位审核确认", "mainReceive", "维保单位待受理", "监管单位已驳回", "维保单位已撤回"),

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

@@ -56,51 +56,6 @@ public class JgMaintenanceContractController extends BaseController {
         return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.saveOrSubmit(submit,model, reginParams));
     }
 
-    /**
-     * 更新维保合同和设备对应关系
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/updateMaintenanceAndEquipment")
-    @ApiOperation(httpMethod = "POST", value = "更新维保合同和设备对应关系", notes = "更新维保合同和设备对应关系")
-    public ResponseModel<Object> updateMaintenanceAndEquipment(@RequestBody Map<String , Object> model,
-                                                               @RequestParam(value = "submit",required = false,defaultValue = "0") String submit) {
-        JgMaintenanceContractDto dto = JSON.parseObject(JSON.toJSONString(model), JgMaintenanceContractDto.class);
-        List<Map<String, Object>> list = (List<Map<String, Object>>) model.get("equipmentLists");
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.updateMaintenanceAndEquipment(submit,dto,list));
-    }
-
-    /**
-     * 提交
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/submit")
-    @ApiOperation(httpMethod = "POST", value = "维保合同提交", notes = "维保合同提交")
-    public ResponseModel<Object> submit(@RequestBody Map<String , Object> model) {
-        JgMaintenanceContractDto dto = JSON.parseObject(JSON.toJSONString(model), JgMaintenanceContractDto.class);
-        String comment = String.valueOf(model.get("comment"));
-        String operate = String.valueOf(model.get("operate"));
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.submit(dto,comment,operate));
-    }
-
-    /**
-     * 审批
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/approval")
-    @ApiOperation(httpMethod = "POST", value = "审批", notes = "审批")
-    public ResponseModel<Object> approval(@RequestBody Map<String , Object> model) {
-        JgMaintenanceContractDto dto = JSON.parseObject(JSON.toJSONString(model.get("formData")), JgMaintenanceContractDto.class);
-        String comment = String.valueOf(model.get("comment"));
-        String operate = String.valueOf(model.get("operate"));
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.approval(dto,comment,operate));
-    }
-
 
     /**
      * 撤回
@@ -216,8 +171,7 @@ public class JgMaintenanceContractController extends BaseController {
     public ResponseModel<Page<JgMaintenanceContractVo>> queryForPage(@RequestParam(value = "current") int current,
                                                                       @RequestParam(value = "size") int size,
                                                                       @RequestParam(value = "phase") int phase,
-                                                                      Map<String,Object> map,
-                                                                      JgMaintenanceContractDto maintenanceContractDto) {
+                                                                      Map<String,Object> map) {
         Page<JgMaintenanceContract> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);