企业详情增加二个规定和人员列表页签

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/PlanTaskMapper.java

+package com.yeejoin.amos.boot.module.statistics.api.mapper;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public interface PlanTaskMapper extends BaseMapper {
+
+
+	Page<HashMap<String, Object>> getPlanTaskInfo(@Param("page") Page<Map<String, Object>> page, @Param("map") JSONObject map);
+
+	String getUnitTypeByUseUnitCode(@Param("useUnitCode") String useUnitCode);
+
+	List<Map<String, String>> getUserInfo(@Param("useUnitCode") String useUnitCode, @Param("flag") boolean flag);
+
+	List<Map<String, Object>> getPlanCheckByPlanTaskId(@Param("planTaskId") String planTaskId);
+
+	Page<Map<String, Object>> getPersonPage(@Param("page") Page page, @Param("map") JSONObject map);
+
+	List<Map<String, Object>> getPostList();
+
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/PlanTask.xml

+<?xml version="1.0" encoding="UTF-8" ?> <!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.statistics.api.mapper.PlanTaskMapper">
+
+	<sql id="planTaskInfoSql">
+		SELECT
+			b.id,
+			a.plan_id planId,
+			a.id planTaskId,
+			c. NAME planName,
+			e. NAME routeName,
+			d. NAME pointName,
+			a.user_name userName,
+			date_format(
+				a.begin_time,
+				'%Y-%m-%d %H:%i:%s'
+			) beginTime,
+			date_format(
+				a.end_time,
+				'%Y-%m-%d %H:%i:%s'
+			) endTime,
+			b.is_finish status,
+			 (case b.is_finish
+                when	0 THEN '尚未巡检'
+                when	1 THEN '按时完成'
+                else	'超时漏检' END) as statusName,
+		    pc.is_ok isOk,
+			(case pc.is_ok
+				 when	1 THEN '合格'
+				 when	2 THEN '不合格'
+				 else	'漏检' END) as isOkName
+		FROM p_plan_task_detail b
+		LEFT JOIN p_check pc ON pc.plan_task_detail_id = b.id
+		LEFT JOIN	p_plan_task a ON a.id = b.task_no
+		LEFT JOIN	p_plan c ON c.id = a.plan_id
+		LEFT JOIN	p_point d ON d.id = b.point_id
+		LEFT JOIN	p_route e ON e.id = a.route_id
+	</sql>
+	<!--计划执行查询 -->
+	<select id="getPlanTaskInfo" resultType="java.util.HashMap">
+        <include refid="planTaskInfoSql"/>
+        <where>
+            <if test="map.pointName!=null">and d.name like concat('%',#{map.pointName},'%')</if>
+            <if test="map.planName!=null">and c.name like concat('%',#{map.planName},'%')</if>
+            <if test="map.routeName!=null">and e.name like concat('%',#{map.routeName},'%')</if>
+            <if test="map.beginDate==''and map.beginDate!=null">
+				and a.begin_Time <![CDATA[>=]]> #{beginDate}
+            </if>
+            <if test="map.endDate != null and map.endDate != ''">
+				AND a.end_Time <![CDATA[<=]]> #{endDate}
+			</if>
+            <if test="map.status!=null">and b.is_finish = #{map.status}</if>
+            <if test="map.isOk!=null">and pc.is_ok = #{map.isOk}</if>
+            <if test="map.useUnitCode!=null">and a.use_code like concat (#{map.useUnitCode},'%')</if>
+        </where>
+        order by b.id
+    </select>
+	<select id="getUnitTypeByUseUnitCode" resultType="java.lang.String">
+		select unit_type from tz_base_enterprise_info where use_unit_code=#{useUnitCode}
+	</select>
+	<select id="getUserInfo" resultType="java.util.Map">
+		select "name",post from tzs_user_info where
+		unit_code=#{useUnitCode}
+		<if test="flag == true">
+		  and (
+				  post like '%6549%' or
+				  post like '%6548%' or
+				  post like '%6547%'
+		      )
+		</if>
+		<if test="flag == false">
+		  and (
+				post like '%6551%' or
+				post like '%6548%' or
+				post like '%6550%'
+			)
+		</if>
+	</select>
+	<select id="getPlanCheckByPlanTaskId" resultType="java.util.Map">
+		SELECT
+			date_format ( ppt.begin_time, '%Y-%m-%d %H:%i:%s' ) beginTime,
+			date_format ( ppt.end_time, '%Y-%m-%d %H:%i:%s' ) endTime,
+			pc.plan_name planName,
+			pii.NAME inputItemName,
+			pii.item_type itemType,
+			pii.data_json dataJson,
+			pci.input_value inputValue,
+			pcs.photo_data photoData
+		FROM
+			p_check pc
+			LEFT JOIN p_plan_task ppt ON pc.plan_task_id = ppt.id
+			LEFT JOIN p_check_input pci ON pc.id = pci.check_id
+			LEFT JOIN p_input_item pii ON pci.input_id = pii.id
+			LEFT JOIN p_check_shot pcs ON pci.check_id = pcs.check_id
+		WHERE
+			pc.plan_task_id = #{planTaskId}
+	</select>
+	<select id="getPersonPage" resultType="java.util.Map">
+		SELECT
+			tui.sequence_nbr sequenceNbr,
+			tui.name,
+			tui.profile,
+			tui.certificate_num certificateNum,
+			tui.post_name postName
+		FROM
+			tzs_user_info tui
+		where
+			tui.is_delete = '0' and tui.unit_code = #{map.useUnitCode}
+		<if test="map.name != null and map.name != ''">
+			AND tui.name LIKE concat ( '%', #{map.name}, '%' )
+		</if>
+		<if test="map.certificateNum != null and map.certificateNum != ''">
+			AND tui.certificate_num LIKE concat ( '%', #{map.certificateNum}, '%' )
+		</if>
+		<if test="map.post != null and map.post != ''">
+			AND tui.post LIKE concat ( '%', #{map.post}, '%' )
+		</if>
+	</select>
+	<select id="getPostList" resultType="java.util.Map">
+		SELECT
+			name,
+			code
+		FROM
+			cb_data_dictionary
+		WHERE
+			TYPE LIKE'%QYRYGW%'
+	</select>
+
+
+</mapper>
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.statistcs.biz.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.SafetyProblemTracingDto;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.EnterpriseBizByTCMServiceImpl;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.EnterpriseBizServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
@@ -8,14 +12,13 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.PageParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 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;
 
 /**
@@ -51,4 +54,39 @@ public class EnterpriseBizController {
     public ResponseModel<Map<String, Object>> getInfoByUseCodeMap(String useCode) {
         return ResponseHelper.buildResponse(enterpriseBizByTCMService.getInfoByUseCodeMap(useCode));
     }
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @RequestMapping(value = "/getTwoRules", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取规定计划信息", notes = "获取规定计划信息")
+    public ResponseModel<Map<String, Object>> getTwoRules(@RequestParam Map<String, Object> map) {
+        JSONObject jsonObject = new JSONObject(map);
+        Page<Map<String,Object>> page = new Page<>();
+        page.setCurrent(Long.valueOf(jsonObject.getString("current")));
+        page.setSize(Long.valueOf(jsonObject.getString("size")));
+        return ResponseHelper.buildResponse(enterpriseBizByTCMService.getTwoRules(page,jsonObject));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @RequestMapping(value = "/getPlanCheck", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取规定计划信息详情", notes = "获取规定计划信息详情")
+    public ResponseModel<List<Map<String, Object>>> getPlanCheck(@RequestParam String planTaskId) {
+        return ResponseHelper.buildResponse(enterpriseBizByTCMService.getPlanCheck(planTaskId));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/personPage")
+    @ApiOperation(httpMethod = "GET", value = "查询人员列表", notes = "查询人员列表")
+    public ResponseModel<Page<Map<String, Object>>> personPage(@RequestParam Map<String, Object> map) {
+        JSONObject jsonObject = new JSONObject(map);
+        Page<Map<String,Object>> page = new Page<>();
+        page.setCurrent(Long.valueOf(jsonObject.getString("current")));
+        page.setSize(Long.valueOf(jsonObject.getString("size")));
+        return ResponseHelper.buildResponse(enterpriseBizByTCMService.getPersonPage(jsonObject, page));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getPostList")
+    @ApiOperation(httpMethod = "GET", value = "查询人员类型", notes = "查询人员类型")
+    public ResponseModel<List<Map<String, Object>>> getPostList() {
+        return ResponseHelper.buildResponse(enterpriseBizByTCMService.getPostList());
+    }
 }

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

@@ -3,9 +3,11 @@ package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
@@ -13,18 +15,20 @@ import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.statistics.api.enums.ProblemStatusEnum;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.statistics.api.dto.TzBaseEnterpriseInfoDto;
+import com.yeejoin.amos.boot.module.statistics.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.statistics.api.entity.TzsBaseInstitution;
 import com.yeejoin.amos.boot.module.statistics.api.enums.EnterpriseEnums;
+import com.yeejoin.amos.boot.module.statistics.api.enums.ProblemStatusEnum;
 import com.yeejoin.amos.boot.module.statistics.api.enums.UnitDataSourceEnum;
 import com.yeejoin.amos.boot.module.statistics.api.enums.UnitTypeEnum;
 import com.yeejoin.amos.boot.module.statistics.api.feign.AccessFeignService;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.EnterpriseBizMapper;
+import com.yeejoin.amos.boot.module.statistics.api.mapper.PlanTaskMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.TzsBaseInstitutionMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.BaseUnitLicenceDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.BaseUnitLicence;
-import com.yeejoin.amos.boot.module.statistics.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.BaseUnitLicenceMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.flc.api.dto.RegUnitIcDto;
@@ -36,6 +40,7 @@ import com.yeejoin.amos.boot.module.ymt.flc.api.mapper.RegUnitInfoMapper;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -79,6 +84,8 @@ public class EnterpriseBizByTCMServiceImpl {
 
     private RegUnitIcMapper regUnitIcMapper;
 
+    private PlanTaskMapper planTaskMapper;
+
     public EnterpriseBizByTCMServiceImpl(RedisUtils redisUtils, StCommonServiceImpl stCommonService,
                                          TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper,
                                          EnterpriseBizMapper enterpriseBizMapper,
@@ -87,7 +94,8 @@ public class EnterpriseBizByTCMServiceImpl {
                                          DataDictionaryServiceImpl iDataDictionaryService,
                                          BaseUnitLicenceMapper baseUnitLicenceMapper,
                                          RegUnitInfoMapper regUnitInfoMapper,
-                                         RegUnitIcMapper regUnitIcMapper) {
+                                         RegUnitIcMapper regUnitIcMapper,
+                                         PlanTaskMapper planTaskMapper) {
         this.redisUtils = redisUtils;
         this.stCommonService = stCommonService;
         this.tzBaseEnterpriseInfoMapper = tzBaseEnterpriseInfoMapper;
@@ -98,6 +106,7 @@ public class EnterpriseBizByTCMServiceImpl {
         this.baseUnitLicenceMapper = baseUnitLicenceMapper;
         this.regUnitInfoMapper = regUnitInfoMapper;
         this.regUnitIcMapper = regUnitIcMapper;
+        this.planTaskMapper = planTaskMapper;
     }
 
     public Map<String, Object> getInfoByUseCodeMap(String useCode) {
@@ -344,4 +353,98 @@ public class EnterpriseBizByTCMServiceImpl {
     }
 
 
+    public Map<String, Object> getTwoRules(Page<Map<String,Object>> page, JSONObject map) {
+        Map<String, Object> result = new HashMap<>();
+        //查询列表信息
+        Page<HashMap<String, Object>> pageList = planTaskMapper.getPlanTaskInfo(page,map);
+        result.put("taskList",pageList);
+        //查询企业类型
+        String unitType = planTaskMapper.getUnitTypeByUseUnitCode(map.getString("useUnitCode"));
+        List<Map<String,String>> userinfoList = new ArrayList<>();
+        List<Map<String,Object>> userResult = new ArrayList<>();
+        //查询人员信息
+        if(null != unitType && unitType.contains("使用单位")){
+            userinfoList = planTaskMapper.getUserInfo(map.getString("useUnitCode"),true);
+            //主要负责人
+            Map<String,Object> userMap1 = new HashMap<>();
+            userMap1.put("postName","主要负责人");
+            userMap1.put("name",new ArrayList<>());
+            userMap1.put("postCode","6548");
+            //安全总监
+            Map<String,Object> userMap2 = new HashMap<>();
+            userMap2.put("postName","安全总监");
+            userMap2.put("name",new ArrayList<>());
+            userMap2.put("postCode","6547");
+            //安全员
+            Map<String,Object> userMap3 = new HashMap<>();
+            userMap3.put("postName","安全员");
+            userMap3.put("name",new ArrayList<>());
+            userMap3.put("postCode","6549");
+            for(int i = 0;i<userinfoList.size();i++){
+                String postString = userinfoList.get(i).get("post");
+                if(!StrUtil.isEmpty(postString)){
+                    JSONArray postArray = JSONArray.parseArray(postString);
+                    if(postArray.contains("6548")){
+                        ((List)userMap1.get("name")).add(userinfoList.get(i).get("name"));
+                    }else if(postArray.contains("6547")){
+                        ((List)userMap2.get("name")).add(userinfoList.get(i).get("name"));
+                    }else if(postArray.contains("6549")){
+                        ((List)userMap3.get("name")).add(userinfoList.get(i).get("name"));
+                    }
+                }
+            }
+            userResult.add(userMap1);
+            userResult.add(userMap2);
+            userResult.add(userMap3);
+        }else{
+            userinfoList = planTaskMapper.getUserInfo(map.getString("useUnitCode"),false);
+            //主要负责人
+            Map<String,Object> userMap1 = new HashMap<>();
+            userMap1.put("postName","主要负责人");
+            userMap1.put("name",new ArrayList<>());
+            userMap1.put("postCode","6548");
+            //质量安全总监
+            Map<String,Object> userMap2 = new HashMap<>();
+            userMap2.put("postName","质量安全总监");
+            userMap2.put("name",new ArrayList<>());
+            userMap2.put("postCode","6550");
+            //质量安全员
+            Map<String,Object> userMap3 = new HashMap<>();
+            userMap3.put("postName","质量安全员");
+            userMap3.put("name",new ArrayList<>());
+            userMap3.put("postCode","6551");
+            for(int i = 0;i<userinfoList.size();i++){
+                String postString = userinfoList.get(i).get("post");
+                if(!StrUtil.isEmpty(postString)){
+                    JSONArray postArray = JSONArray.parseArray(postString);
+                    if(postArray.contains("6548")){
+                        ((List)userMap1.get("name")).add(userinfoList.get(i).get("name"));
+                    }else if(postArray.contains("6550")){
+                        ((List)userMap2.get("name")).add(userinfoList.get(i).get("name"));
+                    }else if(postArray.contains("6551")){
+                        ((List)userMap3.get("name")).add(userinfoList.get(i).get("name"));
+                    }
+                }
+            }
+            userResult.add(userMap1);
+            userResult.add(userMap2);
+            userResult.add(userMap3);
+        }
+        result.put("person",userResult);
+        return result;
+    }
+
+    public List<Map<String, Object>> getPlanCheck(String planTaskId) {
+        List<Map<String,Object>> result = planTaskMapper.getPlanCheckByPlanTaskId(planTaskId);
+        return result;
+    }
+
+    public Page<Map<String,Object>> getPersonPage(JSONObject map, Page page) {
+        Page<Map<String, Object>> result = planTaskMapper.getPersonPage(page, map);
+        return result;
+    }
+
+    public List<Map<String, Object>> getPostList() {
+        return planTaskMapper.getPostList();
+    }
 }

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

@@ -71,6 +71,55 @@
           {"dataRenderingMode": "actionDetailBtn","dataIndex": "action","width": 60,"align": "left","title": "操作","key": "9", "conf": { "title": "设备详情", "linkModelKey": "equip" } }
         ]
       }
+    },
+    {
+      "key": "gd",
+      "displayName": "二个规定",
+      "renderType": "basic",
+      "useAloneApi": true,
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/statistics/dp/biz-enterprise/getTwoRules",
+          "params": {
+            "current": 1,
+            "size": 10,
+            "useUnitCode": "{useUnitCode}",
+            "pointName": "{pointName}",
+            "planName": "{planName}",
+            "routeName": "{routeName}",
+            "beginDate": "{beginDate}",
+            "endDate": "{endDate}",
+            "status": "{status}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result"
+          }
+        }
+      }
+    },
+    {
+      "key": "user",
+      "displayName": "人员列表",
+      "renderType": "basic",
+      "useAloneApi": true,
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/statistics/dp/biz-enterprise/personPage",
+          "params": {
+            "current": 1,
+            "size": 10,
+            "useUnitCode": "{useUnitCode}",
+            "certificateNum": "{certificateNum}",
+            "name": "{name}",
+            "post": "{post}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result"
+          }
+        }
+      }
     }
   ],
   "content": {