新增二级页面已经跳转

bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/AdmissionRequestController.java

@@ -74,6 +74,26 @@ public class AdmissionRequestController extends BaseController {
         return getDataTableError(new ArrayList<>());
     }
 
+    /**
+     * 特殊工种列表
+     *
+     * @param bean 特殊工种列表
+     * @return 特殊工种列表
+     */
+    @RequiresPermissions("system:listPersonnelInformation:list")
+    @GetMapping("/listPersonnelInfo")
+    @SysLog(title = "特殊工种列表", businessType = OperaType.QUERY, logType = 0, module = "人员管理->人员信息列表", details = "查询人员信息列表")
+    public TableDataInfo listPersonnelInfo(AdmissionRequest bean) {
+        try {
+            startPage();
+            List<AdmissionRequest> list = arService.listPersonnelInfo(bean);
+            return getDataTable(list);
+        } catch (Exception e) {
+            logger.error(e.toString(), e);
+        }
+        return getDataTableError(new ArrayList<>());
+    }
+
     /**
      * 获取人员出场列表
      *

bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/EquipController.java

@@ -50,6 +50,24 @@ public class EquipController extends BaseController {
         return getDataTableError(new ArrayList<>());
     }
 
+
+    /**
+     * 特种设备列表
+     */
+    @RequiresPermissions("system:equip:list")
+    @GetMapping("/listEquipment")
+    @SysLog(title = "特种设备列表", businessType = OperaType.QUERY, logType = 0, module = "工器具管理->列表查询")
+    public TableDataInfo listEquipment(Equipment bean) {
+        try {
+//            startPage();
+            List<Equipment> list = service.listEquipment(bean);
+            return getDataTable1(list);
+        } catch (Exception e) {
+            log.error(e.toString(), e);
+        }
+        return getDataTableError(new ArrayList<>());
+    }
+
     /**
      * 新增工器具
      *

bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/IndexBean.java

@@ -23,4 +23,8 @@ public class IndexBean extends BaseBean implements Serializable {
     private String specialPersonNum;
     private String equipNum;
     private String specialEquipNum;
+    /**
+     * 是否外委外包项目 0:工程建设  1：外委外包
+     */
+    private String isOutsource;
 }

bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/AdmissionRequestMapper.java

@@ -283,4 +283,6 @@ public interface AdmissionRequestMapper {
      * @return 结果
      */
     int updateSysUserInfo(AdmissionRequest bean);
+
+    List<AdmissionRequest> listPersonnelInfo(AdmissionRequest bean);
 }

bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/EquipMapper.java

@@ -73,4 +73,6 @@ public interface EquipMapper {
      * @return 工器具入场审批列表
      */
     List<Equipment> entryOfUtensilsList(Equipment bean);
+
+    List<Equipment> listEquipment(Equipment bean);
 }

bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java

@@ -149,4 +149,11 @@ public interface AdmissionRequestService {
      * @return 是否存在
      */
     int judgeIsFileComplete(SupervisoryUnit bean);
+
+    /**
+     *特殊工种列表
+     * @param bean
+     * @return
+     */
+    List<AdmissionRequest> listPersonnelInfo(AdmissionRequest bean);
 }

bonus-modules/bonus-project/src/main/java/com/bonus/project/service/EquipService.java

@@ -54,4 +54,11 @@ public interface EquipService {
      * @return 工器具入场审批列表
      */
     List<Equipment> entryOfUtensilsList(Equipment bean);
+
+    /**
+     * 特种设备列表
+     * @param bean
+     * @return
+     */
+    List<Equipment> listEquipment(Equipment bean);
 }

bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java

@@ -789,6 +789,16 @@ public class AdmissionRequestServiceImpl implements AdmissionRequestService {
         return arMapper.judgeIsFileComplete(bean);
     }
 
+    /**
+     *特殊工种列表
+     * @param bean
+     * @return
+     */
+    @Override
+    public List<AdmissionRequest> listPersonnelInfo(AdmissionRequest bean) {
+        return arMapper.listPersonnelInfo(bean);
+    }
+
 
     private static @org.jetbrains.annotations.NotNull SysFileInfo getFileInfo(String classification, String fromType, String informationType,
                                                                               String uuid) {

bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java

@@ -165,6 +165,18 @@ public class EquipServiceImpl implements EquipService {
         }
         return list;
     }
+
+    /**
+     * 特种设备列表
+     * @param bean
+     * @return
+     */
+    @Override
+    public List<Equipment> listEquipment(Equipment bean) {
+        List<Equipment> list = mapper.listEquipment(bean);
+        return list;
+    }
+
     /**
      * 获取工器具文件列表
      * @param bean 工器具bean

bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml

@@ -567,6 +567,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and lpec.pro_id = #{proId}
         </if>
     </select>
+    <select id="listPersonnelInfo" resultType="com.bonus.project.domain.AdmissionRequest">
+
+        SELECT
+            lkc.id AS id,
+            lkc.uuid AS uuid,
+            lkc.pro_id AS proId,
+            lkc.cont_uuid AS contUuid,
+            lkc.cons_persion_id AS consPersonId,
+            lkc.cont_uuid AS contUuid,
+            lkc.sub_uuid AS subUuid,
+            lkc.admission_date AS admissionDate,
+            lkc.departure_date AS departureDate,
+            case lkc.into_status
+                when '1' then '待审批'
+                when '2' then '审批中'
+                when '3' then '已通过'
+                when '4' then '已驳回'
+                when '5' then '已撤回'
+                end as status,
+            lkc.task_id_out AS `taskId`,
+            lkc.proc_inst_id_out as procInsId,
+            pcp.cons_user_id AS consUserId,
+            pcp.cons_name AS consName,
+            if(pcp.sex = '0', '男', '女') AS sex,
+            pcp.age AS age,
+            pcp.phone AS phone,
+            pcp.native AS natives,
+            pcp.id_card AS idCard,
+            pcp.nation AS nation,
+            pcp.home_address AS homeAddress,
+            pcp.address AS address,
+            sdd.dict_label AS post,
+            IFNULL(pcp.work_type, '暂无') AS workType,
+            pcp.face_path AS facePath,
+            pcp.person_type AS personType,
+            pcp.create_time AS createTime,
+            pcp.update_time AS updateTime
+        FROM
+            lk_cont_person lkc
+                LEFT JOIN
+            pt_cons_person pcp ON lkc.cons_persion_id = pcp.cons_user_id
+                AND pcp.is_active = '1'
+                left join sys_dict_data sdd on sdd.dict_value = pcp.post and sdd.dict_type = 'sys_cons_post' and sdd.status =
+                                                                                                                 '0'
+        WHERE
+            lkc.into_status  = '3' and lkc.out_status != '3' and pcp.post = '1'
+    </select>
 
     <insert id="addPtCheckConfigurationDetails">
         insert into pt_check_configuration_details(

bonus-modules/bonus-project/src/main/resources/mapper/system/EquipMapper.xml

@@ -196,5 +196,36 @@
         </if>
         group by ppt.tools_id
     </select>
+    <select id="listEquipment" resultType="com.bonus.project.domain.Equipment">
+        select
+            ppt.tools_id as id,
+            ppt.pro_id as proId,
+            ppt.cont_uuid as conSuuid,
+            ppt.task_id as taskId,
+            ppt.proc_inst_id as procInsId,
+            ppt.uuid as uuid,
+            ppt.tools_name as equipName,
+            ppt.tools_model as model,
+            ppt.tools_unit as unit,
+            ppt.tools_num as num,
+            sdd1.dict_label as equipType,
+            ppt.detection_time as detectionTime,
+            ppt.next_detection_time as nextDetectionTime,
+            if(ppt.is_detection = '1','是','否') as isForceDetection,
+            ppt.create_time as createTime,
+            ppt.admission_date as admissionDate,
+            ppt.departure_date as departureDate,
+            ppt.status as intoStatus,
+            '0' as status,
+            group_concat(pci.information_path) as filePath
+        from pt_pro_tools ppt
+                 left join sys_dict_data sdd1 on sdd1.dict_value = ppt.tools_type and sdd1.dict_type = 'sys_tools_type' and
+                                                 sdd1.status = '0'
+                 left join sys_dict_data sdd on sdd.dict_value = ppt.status and sdd.dict_type = 'sys_approval_state' and
+                                                sdd.status = '0'
+                 left join pt_cons_information pci on pci.uuid = ppt.uuid and pci.from_type = '4' and pci.information_type = '4'
+            and pci.is_active = '1'
+        where ppt.is_active = '1' and ppt.status = '3' and ppt.tools_type = '2' group by ppt.tools_id
+    </select>
 </mapper>
 

bonus-modules/bonus-project/src/main/resources/mapper/system/OutsourcingProMapper.xml

@@ -532,6 +532,7 @@
        select
            pro_id as id,
            pro_name as proName,
+           is_outsource as isOutsource,
            if(pro_status = '3','在建中','筹备中') as proStatus
            from pt_project_info
            where is_active = '1' and (pro_status = '3' or pro_status = '2')