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/dto/JgMaintenanceContractDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author system_generator
@@ -60,6 +62,13 @@ public class JgMaintenanceContractDto extends BaseDto {
     @ApiModelProperty(value = "维保合同结束日期")
     private Date informEnd;
 
+    @ApiModelProperty(value = "管理员id")
+    private String maintenanceManagerId;
+
+    @ApiModelProperty(value = "管理员姓名")
+    private String maintenanceManagerName;
+
+
     @ApiModelProperty(value = "维保负责人一id")
     private String maintenanceManagerOneId;
 
@@ -73,9 +82,6 @@ public class JgMaintenanceContractDto extends BaseDto {
     @ApiModelProperty(value = "24小时维保电话")
     private String maintenance24Tel;
 
-    @ApiModelProperty(value = "办理流程")
-    private String applyFlow;
-
     @ApiModelProperty(value = "备注")
     private String remark;
 
@@ -101,4 +107,18 @@ public class JgMaintenanceContractDto extends BaseDto {
     @ApiModelProperty(value = "创建时间")
     private Date createDate;
 
+    @TableField("instance_status")
+    private String instanceStatus;
+
+    @TableField("next_execute_ids")
+    private String nextExecuteIds;
+
+    @TableField("promoter")
+    private String promoter;
+
+    @TableField("status")
+    private String status;
+
+    private List<String> roleIds;
+
 }

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

@@ -101,6 +101,19 @@ public class JgMaintenanceContract extends BaseEntity {
     private Date informEnd;
 
     /**
+     * 管理员id
+     */
+    @TableField("maintenance_manager_id")
+    private String maintenanceManagerId;
+
+    /**
+     * 管理员id
+     */
+    @TableField("maintenance_manager_name")
+    private String maintenanceManagerName;
+
+
+    /**
      * 维保负责人一id
      */
 	@TableField("maintenance_manager_one_id")
@@ -126,12 +139,6 @@ public class JgMaintenanceContract extends BaseEntity {
     private String maintenance24Tel;
 
     /**
-     * 办理流程
-     */
-	@TableField("apply_flow")
-    private String applyFlow;
-
-    /**
      * 备注
      */
 	@TableField("remark")
@@ -180,4 +187,19 @@ public class JgMaintenanceContract extends BaseEntity {
 	@TableField("create_date")
     private Date createDate;
 
+    @TableField("instance_status")
+    private String instanceStatus;
+
+    @TableField("next_execute_ids")
+    private String nextExecuteIds;
+
+    @TableField("promoter")
+    private String promoter;
+
+    /**
+     * 状态
+     */
+    @TableField("status")
+    private String status;
+
 }

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

@@ -8,7 +8,8 @@ import io.swagger.models.auth.In;
 public enum MaintenanceEnum {
     SHIYONG(0,"使用单位"),
     WEIBAO(1,"维保单位"),
-    JIANGUAN(2,"监管单位");
+    JIANGUAN(2,"监管单位"),
+    OVER(3,"维保结束");
 
     private Integer code;
     private String msg;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgMaintenanceContractEqMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  *  Mapper 接口
@@ -10,4 +13,6 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
  */
 public interface JgMaintenanceContractEqMapper extends CustomBaseMapper<JgMaintenanceContractEq> {
 
+    Boolean deleteForBatch(@Param("ids") List<Long> ids);
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgMaintenanceContractMapper.java

@@ -24,4 +24,6 @@ public interface JgMaintenanceContractMapper extends BaseMapper<JgMaintenanceCon
 
     Boolean deleteForBatch(@Param("ids") List<Long> ids);
 
+    void updatePromoter(@Param("id")Long id);
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgMaintenanceContractVo.java

 package com.yeejoin.amos.boot.module.jg.api.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -20,6 +22,9 @@ public class JgMaintenanceContractVo {
     @TableField("维保单位-驳回-是否可操作")
     private Boolean rejectedIsFlag;
 
+    @TableField("使用:0,维保:1,监管:2")
+    private String phase;
+
     @TableField("维保备案编号")
     private String applyNo;
 
@@ -83,9 +88,6 @@ public class JgMaintenanceContractVo {
     @TableField("24小时维保电话")
     private String maintenance24Tel;
 
-    @TableField("办理流程")
-    private String applyFlow;
-
     @TableField("备注")
     private String remark;
 
@@ -110,4 +112,37 @@ public class JgMaintenanceContractVo {
 
     @TableField("创建时间")
     private Date createDate;
+
+    @TableField("管理员id")
+    private String maintenanceManagerId;
+
+    @ApiModelProperty(value = "管理员姓名")
+    private String maintenanceManagerName;
+
+    @ApiModelProperty(value = "主键ID")
+    protected Long sequenceNbr;
+
+    @ApiModelProperty(value = "更新时间")
+    protected Date recDate;
+
+    @ApiModelProperty(value = "更新人id")
+    protected String recUserId;
+
+    @ApiModelProperty(value = "更新人")
+    protected String recUserName;
+
+    @ApiModelProperty(value = "是否删除")
+    private Boolean isDelete=false;
+
+    @ApiModelProperty("instance_status")
+    private String instanceStatus;
+
+    @ApiModelProperty("next_execute_ids")
+    private String nextExecuteIds;
+
+    @ApiModelProperty("promoter")
+    private String promoter;
+
+    @ApiModelProperty("status")
+    private String status;
 }

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

@@ -2,4 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractEqMapper">
 
+    <delete id="deleteForBatch">
+        UPDATE amos_tzs_biz.tzs_jg_maintenance_contract_eq tjmce
+        set tjmce.is_delete = 1
+        WHERE tjmce.sequence_nbr in
+        <foreach collection="ids" separator="," item="id" open="(" close=")">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>

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

@@ -40,6 +40,9 @@
             <if test="dto.informEnd != null">
                 inform_end = #{dto.informEnd},
             </if>
+            <if test="dto.maintenanceManagerId != null">
+                maintenance_manager_id = #{dto.maintenanceManagerId},
+            </if>
             <if test="dto.maintenanceManagerOneId != null">
                 maintenance_manager_one_id = #{dto.maintenanceManagerOneId},
             </if>
@@ -52,9 +55,6 @@
             <if test="dto.maintenance24Tel != null">
                 maintenance_24_tel = #{dto.maintenance24Tel},
             </if>
-            <if test="dto.applyFlow != null">
-                apply_flow = #{dto.applyFlow},
-            </if>
             <if test="dto.remark != null">
                 remark = #{dto.remark},
             </if>
@@ -79,12 +79,19 @@
             <if test="dto.instanceId != null">
                 instance_id = #{dto.instanceId},
             </if>
-
+            <if test="dto.promoter != null">
+                promoter = #{dto.promoter}
+            </if>
         </set>
         WHERE sequence_nbr = #{dto.sequenceNbr}
     </update>
+    <update id="updatePromoter">
+        UPDATE amos_tzs_biz.tzs_jg_maintenance_contract set promoter = null
+        where sequence_nbr = #{id}
+    </update>
     <delete id="deleteForBatch">
-        delete from amos_tzs_biz.tzs_jg_maintenance_contract tjmc
+        UPDATE amos_tzs_biz.tzs_jg_maintenance_contract tjmc
+        set tjmc.is_delete = 1
         WHERE tjmc.sequence_nbr in
         <foreach collection="ids" separator="," item="id" open="(" close=")">
             #{id}
@@ -110,7 +117,6 @@
         maintenance_manager_two_id,
         emergency_call,
         maintenance_24_tel,
-        apply_flow,
         remark,
         is_delete,
         input_unit_no,
@@ -126,6 +132,7 @@
         FROM
         amos_tzs_biz.tzs_jg_maintenance_contract
         <where>
+            is_delete = 0
             <if test="contractDto.applyNo != '' and contractDto.applyNo != null">
                 and apply_no like concat('%',#{contractDto.applyNo},'%')
             </if>
@@ -138,9 +145,6 @@
             <if test="contractDto.applyStatus != '' and contractDto.applyStatus != null">
                 and apply_status like concat('%',#{contractDto.applyStatus},'%')
             </if>
-            <if test="contractDto.applyFlow != '' and contractDto.applyFlow != null">
-                and apply_flow like concat('%',#{contractDto.applyFlow},'%')
-            </if>
             <if test="contractDto.useUnitCode != '' and contractDto.useUnitCode != null">
                 and use_unit_code = #{contractDto.useUnitCode}
             </if>
@@ -150,6 +154,11 @@
             <if test="contractDto.receiveOrgCode != '' and contractDto.receiveOrgCode != null">
                 and receive_org_code = #{contractDto.receiveOrgCode}
             </if>
+            <if test="contractDto.roleIds != null">
+                <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
+                    instance_status like concat('%',#{role},'%')
+                </foreach>
+            </if>
         </where>
     </select>
     <select id="queryBySequenceNbr"

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -117,7 +119,8 @@ public class CommonController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getEnterpriseEmployee")
 	@ApiOperation(httpMethod = "GET", value = "查询企业的下面的人员", notes = "查询企业的下面的人员")
-	public ResponseModel<List<Map<String,Object>>> getEnterpriseEmployee(@RequestParam(value = "unitCode") String unitCode) {
-		return ResponseHelper.buildResponse(commonService.getEnterpriseEmployee(unitCode));
+	public ResponseModel<List<Map<String,Object>>> getEnterpriseEmployee(@RequestParam String unitCode) {
+		String companyCode = unitCode.split("_")[0];
+		return ResponseHelper.buildResponse(commonService.getEnterpriseEmployee(companyCode));
 	}
 }

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
@@ -16,8 +18,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 维保合同备案
@@ -55,9 +56,11 @@ public class JgMaintenanceContractController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/updateMaintenanceAndEquipment")
     @ApiOperation(httpMethod = "POST", value = "更新维保合同和设备对应关系", notes = "更新维保合同和设备对应关系")
-    public ResponseModel<Object> updateMaintenanceAndEquipment(@RequestBody JgMaintenanceContractDto model,
-                                        List<Integer> equipmentLists) {
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.updateMaintenanceAndEquipment(model, equipmentLists));
+    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));
     }
 
     /**
@@ -68,43 +71,40 @@ public class JgMaintenanceContractController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/submit")
     @ApiOperation(httpMethod = "POST", value = "维保合同提交", notes = "维保合同提交")
-    public ResponseModel<Object> submit(@RequestBody JgMaintenanceContractDto model) {
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.submit(model));
+    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 = "/revocation")
-    @ApiOperation(httpMethod = "POST", value = "维保合同撤回", notes = "维保合同撤回")
-    public ResponseModel<Object> revocation(@RequestBody JgMaintenanceContractDto model) {
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.revocation(model));
-    }
-    /**
-     * 维保合同驳回
+     * 审批
      *
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/rejected")
-    @ApiOperation(httpMethod = "POST", value = "维保合同驳回", notes = "维保合同驳回")
-    public ResponseModel<Object> rejected(@RequestBody JgMaintenanceContractDto model) {
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.rejected(model));
+    @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));
     }
 
+
     /**
-     * 维保合同受理
+     * 撤回
      *
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/accepted")
-    @ApiOperation(httpMethod = "POST", value = "维保合同受理", notes = "维保合同受理")
-    public ResponseModel<Object> accepted(@RequestBody JgMaintenanceContractDto model) {
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.accepted(model));
+    @PostMapping(value = "/revocation")
+    @ApiOperation(httpMethod = "POST", value = "维保合同撤回", notes = "维保合同撤回")
+    public ResponseModel<Object> revocation(@RequestBody JSONObject map) {
+        jgMaintenanceContractServiceImpl.revocation(String.valueOf(map.get("instanceId")));
+        return ResponseHelper.buildResponse("ok");
     }
 
     /**
@@ -163,6 +163,14 @@ public class JgMaintenanceContractController extends BaseController {
         return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.queryBySequenceNbr(sequenceNbr));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/flowExecute")
+    @ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
+    public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
+        jgMaintenanceContractServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("comment")), true);
+        return ResponseHelper.buildResponse("ok");
+    }
+
     /**
      * 列表分页查询
      *
@@ -185,16 +193,4 @@ public class JgMaintenanceContractController extends BaseController {
         return ResponseHelper.buildResponse(contractDtoPage);
     }
 
-    /**
-     * 列表全部数据查询
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询维保合同备案", notes = "列表全部数据查询维保合同备案")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<JgMaintenanceContractDto>> selectForList() {
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.queryForJgMaintenanceContractList());
-    }
-
 }

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
+import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractEqDto;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -13,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractEqDto;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 

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/CommonServiceImpl.java

@@ -163,7 +163,7 @@ public class CommonServiceImpl implements ICommonService {
         if (type.equals("use")) {
             type = "使用单位";
         } else if (type.equals("maintenance")) {
-            type = "维保单位";
+            type = "安装改造维修单位";
         } else if (type.equals("inspection")) {
             type = "检验检测机构";
         }
@@ -190,7 +190,7 @@ public class CommonServiceImpl implements ICommonService {
 
     @Override
     public Map<String, Object> getUserInfo(String sequenceNbr) {
-        return commonMapper.getUserInfo(sequenceNbr);
+        return commonMapper.getUserInfo(sequenceNbr.split("_")[0]);
     }
 
     @Override

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/JgMaintenanceContractEqServiceImpl.java

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractEqDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintenanceContractEqService;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractEqDto;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;