bug修改

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

@@ -325,5 +325,6 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
      */
     List<CountDto> countBizNumAfterUseRegBatchProjectContraption(@Param("projectContraptionIds") List<Long> projectContraptionIds);
 
+    List<Map<String, String>> gdEquOnJgServiceOperationRecords(@Param("record") String record);
 }
 

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

@@ -3131,4 +3131,33 @@
         )
         group by projectContraptionId
     </select>
+    <select id="gdEquOnJgServiceOperationRecords" resultType="java.util.Map">
+        SELECT
+            tjri.sequence_nbr AS sequenceNbr,
+            tjri.business_type AS businessType,
+            tjri.apply_no AS applyNo,
+            tjri.rec_user_id AS recUserId,
+            tjri.rec_user_name AS recUserName,
+            DATE_FORMAT ( rec_date, '%Y-%m-%d %H:%i:%s' ) AS recDate,
+            tjri.approval_unit AS approvalUnit,
+            tjri.status,
+            tjri.route_path AS routePath
+        FROM
+            tzs_jg_resume_info tjri
+            JOIN (
+            SELECT tjri2.apply_no,
+            MAX ( tjri2.rec_date ) AS max_rec_date
+            FROM
+            tzs_jg_resume_info
+            tjri2 LEFT JOIN tzs_jg_installation_notice tjin ON tjri2.equ_id = tjin.project_contraption_id
+            LEFT JOIN tzs_jg_installation_notice_eq tjineq ON tjin.sequence_nbr = tjineq.equip_transfer_id
+            WHERE
+            tjineq.equ_id = 'c005586e-0065-4ee8-b89a-5fcad85d4868'
+            GROUP BY
+            tjri2.apply_no
+            ) AS latest ON tjri.apply_no = latest.apply_no
+            AND tjri.rec_date = latest.max_rec_date
+        ORDER BY
+        tjri.rec_date ASC
+    </select>
 </mapper>

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

@@ -1144,13 +1144,12 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
 
         // 更新设备监管部门
         IdxBizJgSupervisionInfo idxBizJgSupervisionInfo = new IdxBizJgSupervisionInfo();
-        if (map.containsKey("orgBranchCode") && !ObjectUtils.isEmpty(map.get("orgBranchCode"))) {
-            String[] data = String.valueOf(map.getString("orgBranchCode")).split("_");
-            HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(data[0]).getResult();
+        if (!ObjectUtils.isEmpty(jgVehicleInformation.getOrgBranchCode())) {
+            HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(jgVehicleInformation.getOrgBranchCode()).getResult();
             // 目前平台返回key为compnay(存在拼写错误)
             CompanyModel parentModel = JSON.parseObject(JSON.toJSONString(parentMessage.get("compnay")), CompanyModel.class);
-            idxBizJgSupervisionInfo.setOrgBranchCode(data[0]);
-            idxBizJgSupervisionInfo.setOrgBranchName(data[1]);
+            idxBizJgSupervisionInfo.setOrgBranchCode(jgVehicleInformation.getOrgBranchCode());
+            idxBizJgSupervisionInfo.setOrgBranchName(jgVehicleInformation.getOrgBranchName());
             idxBizJgSupervisionInfo.setCompanyOrgBranchCode(parentModel.getCompanyCode());
             LambdaQueryWrapper<IdxBizJgSupervisionInfo> eq = new QueryWrapper<IdxBizJgSupervisionInfo>().lambda().eq(IdxBizJgSupervisionInfo::getRecord, map.get("record"));
             idxBizJgSupervisionInfoMapper.update(idxBizJgSupervisionInfo, eq);

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/vo/TzsUserInfoVo.java

 package com.yeejoin.amos.boot.module.statistics.api.vo;
 
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
 import java.util.List;
 
 @Data
 public class TzsUserInfoVo {
 
     /**
+     * 主键
+     */
+    @TableId(value = "sequence_nbr")
+    protected Long sequenceNbr;
+
+    /**
      * 姓名
      */
     @TableField("name")
@@ -119,6 +124,13 @@ public class TzsUserInfoVo {
      */
     @TableField("unit_name")
     private String unitName;
+
+    /**
+     * 单位code
+     */
+    @TableField("unit_code")
+    private String unitCode;
+
     /**
      * 头像
      */

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/JGDPStatisticsController.java

@@ -432,8 +432,9 @@ public class JGDPStatisticsController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "common/equOnJgServiceOperationRecords")
     @ApiOperation(httpMethod = "GET", value = "查询设备在jg业务中的记录", notes = "查询设备在jg业务中的记录")
-    public ResponseModel<List<Map<String, String>>> equOnJgServiceOperationRecords(@RequestParam(value = "record") String record) {
-        return ResponseHelper.buildResponse(statisticsService.equOnJgServiceOperationRecords(record));
+    public ResponseModel<List<Map<String, String>>> equOnJgServiceOperationRecords(@RequestParam(value = "record") String record,
+                                                                                   @RequestParam(value = "equipType", required = false) String equipType) {
+        return ResponseHelper.buildResponse(statisticsService.equOnJgServiceOperationRecords(record,equipType));
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -2135,8 +2135,14 @@ public class JGDPStatisticsServiceImpl {
         }
     }
 
-    public List<Map<String, String>> equOnJgServiceOperationRecords(String record) {
-        return commonMapper.equOnJgServiceOperationRecords(record).stream()
+    public List<Map<String, String>> equOnJgServiceOperationRecords(String record, String equipType) {
+        List<Map<String, String>> maps = new ArrayList<>();
+        if ("8000".equals(equipType)) {
+            maps = commonMapper.gdEquOnJgServiceOperationRecords(record);
+        } else {
+            maps = commonMapper.equOnJgServiceOperationRecords(record);
+        }
+        return maps.stream()
                 .map(x -> {
                     Map<String, String> map = new HashMap<>();
                     map.put("operatingTime", x.get("recDate"));

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/UserBizByTCMServiceImpl.java

@@ -23,7 +23,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.util.ArrayList;
@@ -90,7 +89,7 @@ public class UserBizByTCMServiceImpl {
         tzsUserInfoVo.setSpeciality_required(tzsUserInfo.getSpeciality());
         tzsUserInfoVo.setEducation_required(tzsUserInfo.getEducation());
         tzsUserInfoVo.setJobTitle_required(tzsUserInfo.getJobTitle());
-        String companyType = getUnitType();
+        String companyType = getUnitType(tzsUserInfo.getUnitCode());
         tzsUserInfoVo.setCompanyType(companyType.contains("个人主体") ? "individual" : "no-individual");
         Map<String, Object> userInfoMap = BeanUtil.beanToMap(tzsUserInfoVo);
 //        userInfoMap.putAll(this.getPermissionDataJson(tzsUserInfo.getPermissionData()));
@@ -101,12 +100,12 @@ public class UserBizByTCMServiceImpl {
         return maps;
     }
 
-    public String getUnitType() {
-        List<CompanyModel> companyModels = FeignUtil.remoteCall(() -> Privilege.companyClient.queryListByChild(RequestContext.getExeUserId()));
-        if (companyModels.isEmpty()) {
+    public String getUnitType(String unitCode) {
+        CompanyModel companyModel = FeignUtil.remoteCall(() -> Privilege.companyClient.queryByCompanyCode(unitCode));
+        if (ObjectUtils.isEmpty(companyModel)) {
             return "";
         }
-        return companyModels.get(0).getCompanyType();
+        return companyModel.getCompanyType();
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_8000.json

@@ -89,7 +89,8 @@
           "httpMethod":"GET",
           "apiPath":"/statistics/dp/jg/common/equOnJgServiceOperationRecords",
           "params": {
-            "record": "{record}"
+            "record": "{record}",
+            "equipType": "8000"
           },
           "ruleData": {
             "responseSuccess": "data.result",