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

@@ -30,6 +30,9 @@ public class JgInstallationNoticeDto extends BaseDto {
     @ApiModelProperty(value = "告知单编号")
     private String applyNo;
 
+    @ApiModelProperty(value = "设备监管码")
+    private String supervisoryCode;
+
     @ApiModelProperty(value = "设备种类")
     private String equList;
 
@@ -179,6 +182,7 @@ public class JgInstallationNoticeDto extends BaseDto {
     @ApiModelProperty(value = "是否西咸")
     private String isXixian;
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "告知日期")
     private Date noticeDate;
 

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

@@ -100,4 +100,7 @@ public class JgUseRegistrationDto  extends BaseDto {
 
     private List<String> roleIds;
 
+    private  String dataType  ;
+
+    private String unitCode;
 }

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

@@ -30,6 +30,12 @@ public class JgInstallationNotice extends BaseEntity {
     private String applyNo;
 
     /**
+     * 设备监管码
+     */
+    @TableField("supervisory_code")
+    private String supervisoryCode;
+
+    /**
      * 设备种类
      */
     @TableField("equ_list")

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

@@ -158,4 +158,16 @@ public class JgUseRegistration extends BaseEntity {
 
     @TableField("instance_status")
     private String instanceStatus;
+
+    @TableField("receive_org_code")
+    private String receiveOrgCode;
+
+    @TableField("receive_company_code")
+    private String receiveCompanyCode;
+
+    @TableField("next_execute_ids")
+    private String nextExecuteIds;
+
+
+
 }

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

@@ -24,7 +24,7 @@ public interface JgInstallationNoticeMapper extends CustomBaseMapper<JgInstallat
      * @param type  类型：enterprise-企业端、supervision-监管端
      * @return 安装告知列表
      */
-    Page<JgInstallationNotice> queryForPage(Page<JgInstallationNotice> page, @Param("param") JgInstallationNoticeDto model, @Param("type") String type);
+    Page<JgInstallationNotice> queryForPage(Page<JgInstallationNotice> page, @Param("param") JgInstallationNoticeDto model, @Param("type") String type, @Param("orgCode") String orgCode);
 
     /**
      * 根据安装告知编号查询设备、设计、制造等信息

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

@@ -41,7 +41,7 @@ public interface IJgInstallationNoticeService extends IService<JgInstallationNot
      * @param type  类型：enterprise-企业端、supervision-监管端
      * @return 安装告知列表
      */
-    Page<JgInstallationNoticeDto> queryForJgInstallationNoticePage(Page<JgInstallationNotice> page, JgInstallationNoticeDto model, String type);
+    Page<JgInstallationNoticeDto> queryForJgInstallationNoticePage(Page<JgInstallationNotice> page, JgInstallationNoticeDto model, String type, ReginParams reginParams);
 
     /**
      * 批量删除

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

@@ -6,6 +6,7 @@
         select
             isn.sequence_nbr AS sequenceNbr,
             isn.apply_no AS applyNo,
+            isn.supervisory_code AS supervisoryCode,
             isn.notice_date AS noticeDate,
             isn.use_unit_name AS useUnitName,
             isn.receive_org_name AS receiveOrgName,
@@ -42,6 +43,9 @@
             <if test="type == 'supervision'">
                 AND (isn.notice_status in ('6612', '6613', '6614') or isn.status in('6614') )
             </if>
+            <if test="orgCode != null and orgCode != ''">
+                AND isn.install_unit_credit_code = #{orgCode}
+            </if>
         </where>
         ORDER BY
         isn.notice_date DESC

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

@@ -16,12 +16,13 @@
         use.USE_INNER_CODE as innerCode,
         concat(use.PROVINCE_NAME,'-',use.CITY_NAME,'-',use.COUNTY_NAME) as place,
         ur.instance_id as instanceId,
-        re.equip_id as equipId,
-        ur.apply_no as applyNo
+        re.equ_id as equipId,
+        ur.apply_no as applyNo,
+        ur.next_execute_ids as nextExecuteIds
         from tzs_jg_use_registration ur
-        LEFT JOIN tzs_jg_relation_equip re  on ur.sequence_nbr = re.business_id
-        LEFT JOIN idx_biz_jg_register_info jri  on re.equip_id = jri.RECORD
-        LEFT JOIN idx_biz_jg_use_info  use   on re.equip_id = use.RECORD
+        LEFT JOIN tzs_jg_use_registration_eq re  on ur.sequence_nbr = re.equip_transfer_id
+        LEFT JOIN idx_biz_jg_register_info jri  on re.equ_id = jri.RECORD
+        LEFT JOIN idx_biz_jg_use_info  use   on re.equ_id = use.RECORD
 
         <where>
             and  ur.is_delete = 0
@@ -39,9 +40,15 @@
             </if>
             <if test="roleIds != null">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
-                instance_status like #{role}
+                    instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>
+            <if test="dto.dataType == 'jg' ">
+                and  ur.receive_company_code = #{dto.unitCode}
+            </if>
+            <if test="dto.dataType == 'company' ">
+                and  ur.use_unit_credit_code = #{dto.unitCode}
+            </if>
         </where>
             order by ur.rec_date desc
     </select>

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

@@ -126,7 +126,8 @@ public class JgInstallationNoticeController extends BaseController {
             @RequestBody(required = false) JgInstallationNoticeDto model
     ) {
         Page<JgInstallationNotice> page = new Page<>(current, size);
-        return ResponseHelper.buildResponse(iJgInstallationNoticeService.queryForJgInstallationNoticePage(page, model, type));
+        ReginParams reginParams = getSelectedOrgInfo();
+        return ResponseHelper.buildResponse(iJgInstallationNoticeService.queryForJgInstallationNoticePage(page, model, type, reginParams));
     }
 
     /**

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

@@ -220,8 +220,16 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
      * @return 安装告知列表
      */
     @Override
-    public Page<JgInstallationNoticeDto> queryForJgInstallationNoticePage(Page<JgInstallationNotice> page, JgInstallationNoticeDto model, String type) {
-        Page<JgInstallationNotice> noticePage = jgInstallationNoticeMapper.queryForPage(page, model, type);
+    public Page<JgInstallationNoticeDto> queryForJgInstallationNoticePage(Page<JgInstallationNotice> page, JgInstallationNoticeDto model, String type , ReginParams reginParams) {
+
+        String orgCode;
+        if(type.equals("enterprise")) {
+            orgCode = reginParams.getCompany().getCompanyCode();
+        } else {
+            orgCode = reginParams.getCompany().getOrgCode();
+        }
+
+        Page<JgInstallationNotice> noticePage = jgInstallationNoticeMapper.queryForPage(page, model, type, orgCode);
 
         // 将Page<JgInstallationNotice>转化为Page<JgInstallationNoticeDto>
         Page<JgInstallationNoticeDto> noticeDtoPage = new Page<>();
@@ -613,19 +621,19 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             if("0".equals(op)) {
                 jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.HAVE_PROCESSED.getCode()));
                 this.generateInstallationNoticeReport(jgInstallationNotice.getSequenceNbr());
-            } else {
-                jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
-                jgInstallationNotice.setStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
-            }
-            jgInstallationNotice.setEquRegisterCode(deviceRegistrationCode);
-            jgInstallationNoticeMapper.updateById(jgInstallationNotice);
-
                 // 更新其他业务表
                 tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());
                 tzsJgOtherInfo.setSupervisoryCode(mapCode.get("superviseCode").toString());
                 tzsJgRegistrationInfo.setEquCode(deviceRegistrationCode);
+                jgInstallationNotice.setEquRegisterCode(deviceRegistrationCode);
+                jgInstallationNotice.setSupervisoryCode(mapCode.get("superviseCode").toString());
                 tzsJgOtherInfoMapper.updateById(tzsJgOtherInfo);
                 tzsJgRegistrationInfoMapper.updateById(tzsJgRegistrationInfo);
+            } else {
+                jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+                jgInstallationNotice.setStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
+            }
+            jgInstallationNoticeMapper.updateById(jgInstallationNotice);
         }
 
 //        // 组装监管码

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

@@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -108,7 +109,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setAuditStatus("待提交");
             jgUseRegistration.setStatus(UseStatusEnum.SUBMIT.getPass());
             this.save(jgUseRegistration);
-//            jgRelationEquip.setBusinessId(jgUseRegistration.getSequenceNbr().toString());
+            jgRelationEquip.setEquipTransferId(jgUseRegistration.getSequenceNbr().toString());
             jgRelationEquipMapper.insert(jgRelationEquip);
         }
 
@@ -152,6 +153,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     public String flowExecute(String instanceId, String operate, String comment, Boolean update) {
         String role = "";
         String taskName = "流程结束";
+        ArrayList<String> roleList = new ArrayList<>();
         try {
             JSONObject task = workFlowFeginService.getTaskNoAuth(instanceId);
             JSONObject taskMessage = JSON.parseObject(JSON.toJSONString(task.get("data")));
@@ -176,14 +178,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
                 for (Object datum : data) {
                     if (((Map) datum).containsKey("groupId")) {
-                        role = ((Map) datum).get("groupId").toString();
-                        continue;
+                        roleList.add(((Map) datum).get("groupId").toString());
                     }
                 }
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
+        role= String.join(",", roleList);
         if (update) {
             updateStatus(instanceId, taskName, role);
         }
@@ -198,6 +200,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setStatus(taskName);
             jgUseRegistration.setAuditStatus("已完成");
         } else {
+            jgUseRegistration.setNextExecuteIds(role);
             if (!ObjectUtils.isEmpty(jgUseRegistration.getInstanceStatus())) {
                 jgUseRegistration.setInstanceStatus(jgUseRegistration.getInstanceStatus() + "," + role);
             } else {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionApplicationEquipModel.java

@@ -96,7 +96,7 @@ public class JyjcInspectionApplicationEquipModel extends BaseModel {
     @ApiModelProperty(value = "品牌")
     private String brandName;
     @ApiModelProperty(value = "监管码")
-    private String superVisonryCode;
+    private String supervisoryCode;
     @ApiModelProperty(value = "型号")
     private String equType;
     @ApiModelProperty(value = "制造单位名称")

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationModel.java

 package com.yeejoin.amos.boot.module.jyjc.api.model;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -10,6 +12,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.typroject.tyboot.core.rdbms.model.BaseModel;
 import java.util.Date;
 import java.util.List;
@@ -45,11 +48,10 @@ public class JyjcOpeningApplicationModel extends BaseModel {
     private String resultType;
 
     @ApiModelProperty (value = "有效期至")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date expiryDate;
+    private String expiryDate;
 
     @ApiModelProperty (value = "受理日期（接收日期）")
-    private Date acceptDate;
+    private String acceptDate;
 
     @ApiModelProperty (value = "状态")
     private String status;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcOpeningApplicationMapper.xml

@@ -46,6 +46,7 @@
                 and apply_time >=#{applyStartTime}
             </if>
         </where>
+        order by sequence_nbr desc
 
     </select>
 </mapper>

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

@@ -136,7 +136,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     JyjcInspectionApplicationEquip equipInfo = new JyjcInspectionApplicationEquip();
                     equipInfo.setEquDefine(equip.getEquDefine());
                     equipInfo.setEquList(equip.getEquList());
-                    equipInfo.setEquipUnicode(equip.getSuperVisonryCode());
+                    equipInfo.setEquipUnicode(equip.getSupervisoryCode());
                     equipInfo.setEquCategory(equip.getEquCategoryName());
                     equipInfo.setApplicationSeq(model.getSequenceNbr());
                     jyjcInspectionApplicationEquipService.save(equipInfo);
@@ -174,7 +174,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     JyjcInspectionApplicationEquip equipInfo = new JyjcInspectionApplicationEquip();
                     equipInfo.setEquDefine(equip.getEquDefine());
                     equipInfo.setEquList(equip.getEquList());
-                    equipInfo.setEquipUnicode(equip.getSuperVisonryCode());
+                    equipInfo.setEquipUnicode(equip.getSupervisoryCode());
                     equipInfo.setEquCategory(equip.getEquCategoryName());
                     equipInfo.setApplicationSeq(model.getSequenceNbr());
                     jyjcInspectionApplicationEquipService.save(equipInfo);

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/service/IEquipmentCategoryService.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.ymt.api.service;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.CategoryOtherInfo;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -43,4 +44,6 @@ public interface IEquipmentCategoryService {
     ResponseModel submit(Map<String, Object> map);
 
     void creatXiXian(String type);
+
+    Map<String, Object> commonUpdateEsDataByIds(Map<String, Map<String, Object>> paramMap);
 }

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

@@ -98,6 +98,7 @@ import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StopWatch;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.DateUtil;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -2452,4 +2453,45 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         }
         return true;
     }
+
+    /**
+     * 更新ES中的数据（公共方法）
+     * @param paramMap 更新的参数
+     */
+    public Map<String, Object> commonUpdateEsDataByIds(Map<String, Map<String, Object>> paramMap){
+        if(paramMap.isEmpty()){
+            return null;
+        }
+        Map<String, Object> resultMap = new HashMap<>();
+        for (Map.Entry<String, Map<String, Object>> entry : paramMap.entrySet()) {
+            String record = entry.getKey();
+            Map<String, Object> childMap = entry.getValue();
+            if(!childMap.isEmpty()){
+                ESEquipmentCategoryDto oldData = null;
+                //获取Es中旧的数据
+                Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(record);
+                if(!ObjectUtils.isEmpty(optional)){
+                    oldData = optional.get();
+                }
+                //获取Es中新的参数
+                ESEquipmentCategoryDto newData = JSON.parseObject(toJSONString(childMap), ESEquipmentCategoryDto.class);
+
+                //删除Es中旧的数据
+                if (!ObjectUtils.isEmpty(oldData)) {
+                    esEquipmentCategory.deleteById(record);
+                    //整合新旧数据
+                    Bean.copyExistPropertis(newData, oldData);
+                }
+                if (!ObjectUtils.isEmpty(oldData)) {
+                    oldData.setREC_DATE(System.currentTimeMillis());
+                    ESEquipmentCategoryDto saveData = esEquipmentCategory.save(oldData);
+
+                    //组装返回数据
+                    resultMap.put(record,saveData);
+                }
+            }
+
+        }
+        return resultMap;
+    }
 }
\ No newline at end of file