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

@@ -199,4 +199,7 @@ public class JgTransferNoticeDto extends BaseDto {
 
     @ApiModelProperty(value = "办理日期")
     private Date handleDate;
+
+    private String noticeReportUrl;
+
 }

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

@@ -283,6 +283,8 @@ public class JgTransferNotice extends BaseEntity {
     @TableField("next_execute_ids")
     private String nextExecuteIds;
 
+    @TableField("notice_report_url")
+    private String noticeReportUrl;
 
     @TableField("status")
     private String status;
@@ -293,4 +295,7 @@ public class JgTransferNotice extends BaseEntity {
     @TableField(exist = false)
     private String equipCateName;
 
+    @TableField(value = "handle_date")
+    private Date handleDate;
+
 }

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

@@ -22,7 +22,8 @@
         tjtn.next_execute_ids AS nextExecuteIds,
         tjtn.instance_status AS instanceStatus,
         tjtn.notice_report_url AS noticeReportUrl,
-        ec."name" AS equipCateName
+        ec."name" AS equipCateName,
+        tjtn.handle_date AS handleDate
         FROM
             tzs_jg_transfer_notice tjtn
             LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr
@@ -54,7 +55,7 @@
                 </if>
             </if>
             <if test="type == 'supervision'">
-                AND tjtn.receive_org_code = #{orgCode}
+                AND tjtn.receive_org_code = #{orgCode} AND tjtn.instance_id IS NOT NULL
             </if>
             <if test="type == 'enterprise'">
                 AND tjtn.install_unit_credit_code = #{orgCode}
@@ -89,6 +90,7 @@
             tjtn.city_name AS cityName,
             tjtn.county_name AS countyName,
             tjtn.promoter AS promoter,
+            tjtn.equ_register_code AS equRegisterCode,
             ri.equ_list AS equList,
             ri.equ_category AS equCategory,
             ri.EQU_DEFINE AS equDefine,

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

@@ -18,6 +18,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author system_generator
@@ -46,14 +47,32 @@ public class CommonController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/getUserPhonesByPersonCode")
-    @ApiOperation(httpMethod = "GET", value = "根据公司的unitCode获取检测检验人员列表", notes = "根据公司的unitCode获取检测检验人员列表")
+    @ApiOperation(httpMethod = "GET", value = "根据公司的unitCode获取检测检验人员联系电话", notes = "根据公司的unitCode获取检测检验人员联系电话")
     public ResponseModel<Map<String,Object>> getUserPhonesByPersonCode(@RequestParam String unitCode) {
         List<TzsUserInfo> userPhones = commonserviceImpl.getUserPhonesByPersonCode(unitCode);
         if (CollectionUtils.isEmpty(userPhones)){
             return null;
         }
+        List<String> phones = userPhones.stream().map(TzsUserInfo::getPhone).collect(Collectors.toList());
+        String phone = String.join(",", phones);
+        Map<String,Object> map = new HashMap<>();
+        map.put("phone",phone);
+        return ResponseHelper.buildResponse(map);
+    }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/getInnerPersonCodeByPersonCode")
+    @ApiOperation(httpMethod = "GET", value = "根据公司的unitCode获取检测检验人员内部编号", notes = "根据公司的unitCode获取检测检验人员内部编号")
+    public ResponseModel<Map<String,Object>> getInnerPersonCodeByPersonCode(@RequestParam String unitCode) {
+        List<TzsUserInfo> userPhones = commonserviceImpl.getUserPhonesByPersonCode(unitCode);
+        if (CollectionUtils.isEmpty(userPhones)){
+            return null;
+        }
+        List<String> phones = userPhones.stream().map(TzsUserInfo::getInnerPersonCode).collect(Collectors.toList());
+        String innerPersonCode = String.join(",", phones);
         Map<String,Object> map = new HashMap<>();
-        map.put("phone",userPhones.get(0).getPhone() == null?"":userPhones.get(0).getPhone());
+        map.put("innerPersonCode",innerPersonCode);
         return ResponseHelper.buildResponse(map);
     }
 

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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -50,8 +51,10 @@ public class CommonserviceImpl {
     }
 
     public List<TzsUserInfo> getUserPhonesByPersonCode(String personCode) {
+        List<String> ids = StrUtil.split(personCode, ",");
         QueryWrapper userInfoQueryWrapper = new QueryWrapper<>();
-        userInfoQueryWrapper.eq("sequence_nbr", personCode);
+        userInfoQueryWrapper.in("sequence_nbr", ids);
+
         List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper);
         return userInfos;
     }