工程违章统计

securityControl-common/securityControl-common-core/src/main/java/com/securityControl/common/core/web/page/PageDomain.java

@@ -18,10 +18,6 @@ public class PageDomain
     /** 分页参数合理化 */
     private Boolean reasonable = true;
 
-    private Integer page;
-
-    private Integer limit;
-
 
     public Integer getPageNum()
     {
@@ -58,19 +54,4 @@ public class PageDomain
         this.reasonable = reasonable;
     }
 
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public Integer getLimit() {
-        return limit;
-    }
-
-    public void setLimit(Integer limit) {
-        this.limit = limit;
-    }
 }

securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/ProVioController.java

@@ -5,9 +5,14 @@ import com.github.pagehelper.PageInfo;
 import com.securityControl.common.log.annotation.Log;
 import com.securityControl.common.log.enums.BusinessType;
 import com.sercurityControl.proteam.dutyTask.domain.DutyPersonEntity;
+import com.sercurityControl.proteam.supplement.domain.dto.ParamsDto;
 import com.sercurityControl.proteam.supplement.domain.vo.ProVioVo;
 import com.sercurityControl.proteam.supplement.service.ProVioService;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -20,14 +25,18 @@ import java.util.Map;
  * @version:1.0
  * @description:工程违章统计-controller
  */
+@RestController
+@RequestMapping("/pot/proVio/")
+@Slf4j
 public class ProVioController {
 
     @Resource(name = "ProVioService")
     private ProVioService service;
 
+    @ApiOperation(value = "工程违章统计-列表")
     @PostMapping(value = "getDutyPersonList")
-    @Log(title = "值班人员管理", menu = "值班人员管理->值班人员列表", businessType = BusinessType.QUERY, details = "值班人员列表")
+    @Log(title = "工程违章统计", menu = "值班任务->工程违章统计", businessType = BusinessType.QUERY, details = "工程违章统计")
-    public Map<String, Object> getDutyPersonList(ProVioVo dto) {
+    public Map<String, Object> getDutyPersonList(ParamsDto dto) {
         return service.getProVioList(dto);
     }
 }

securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/dto/ParamsDto.java

@@ -0,0 +1,23 @@
+package com.sercurityControl.proteam.supplement.domain.dto;
+
+import lombok.Data;
+
+/**
+ * @className:ParamsDto
+ * @author:cwchen
+ * @date:2024-12-09-15:58
+ * @version:1.0
+ * @description:前端参数-dto
+ */
+@Data
+public class ParamsDto {
+
+    private String id;
+
+    /**工程名称*/
+    private String proName;
+
+    private int page;
+
+    private int limit;
+}

securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/ProVioVo.java

@@ -11,7 +11,7 @@ import lombok.Data;
  * @description:工程违章统计-vo
  */
 @Data
-public class ProVioVo extends PageDomain {
+public class ProVioVo{
 
     /**id*/
     private String id;
@@ -21,6 +21,8 @@ public class ProVioVo extends PageDomain {
     private String proName;
     /**班组长*/
     private String workManager;
+    /**班组长手机号*/
+    private String workManagerPhone;
     /**风险等级*/
     private String riskLevel;
     /**违章单位*/

securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/mapper/ProVioMapper.java

@@ -1,5 +1,6 @@
 package com.sercurityControl.proteam.supplement.mapper;
 
+import com.sercurityControl.proteam.supplement.domain.dto.ParamsDto;
 import com.sercurityControl.proteam.supplement.domain.vo.ProVioVo;
 import org.springframework.stereotype.Repository;
 
@@ -21,5 +22,5 @@ public interface ProVioMapper {
      * @author cwchen
      * @date 2024/12/9 15:29
      */
-    List<ProVioVo> getProVioList(ProVioVo dto);
+    List<ProVioVo> getProVioList(ParamsDto dto);
 }

securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/ProVioService.java

@@ -1,5 +1,6 @@
 package com.sercurityControl.proteam.supplement.service;
 
+import com.sercurityControl.proteam.supplement.domain.dto.ParamsDto;
 import com.sercurityControl.proteam.supplement.domain.vo.ProVioVo;
 
 import java.util.Map;
@@ -19,5 +20,5 @@ public interface ProVioService {
      * @author cwchen
      * @date 2024/12/9 15:24
      */
-    Map<String, Object> getProVioList(ProVioVo dto);
+    Map<String, Object> getProVioList(ParamsDto dto);
 }

securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/impl/ProVioServiceImpl.java

@@ -3,6 +3,7 @@ package com.sercurityControl.proteam.supplement.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.securityControl.common.core.constant.HttpStatus;
+import com.sercurityControl.proteam.supplement.domain.dto.ParamsDto;
 import com.sercurityControl.proteam.supplement.domain.vo.ProVioVo;
 import com.sercurityControl.proteam.supplement.mapper.ProVioMapper;
 import com.sercurityControl.proteam.supplement.service.ProVioService;
@@ -29,7 +30,7 @@ public class ProVioServiceImpl implements ProVioService {
     private ProVioMapper mapper;
 
     @Override
-    public Map<String, Object> getProVioList(ProVioVo dto) {
+    public Map<String, Object> getProVioList(ParamsDto dto) {
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         Map<String, Object> map = new HashMap<>(16);
         List<ProVioVo> list = null;

securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/ProVioMapper.xml

@@ -3,5 +3,24 @@
 <mapper namespace="com.sercurityControl.proteam.supplement.mapper.ProVioMapper">
 
     <!--工程违章统计-->
-    <select id="getProVioList" resultType="com.sercurityControl.proteam.supplement.domain.vo.ProVioVo"></select>
+    <select id="getProVioList" resultType="com.sercurityControl.proteam.supplement.domain.vo.ProVioVo">
+        SELECT tnv.id,
+               tnv.ticket_no AS ticketNo,
+               tnv.pro_name AS proName,
+               tnv.risk_level AS riskLevel,
+               so.city_name AS org,
+               tnv.type AS `type`,
+               tnv.level_id AS levelId,
+               tnv.content AS content,
+               tnv.child_type AS childType,
+               jjcmi.work_manage AS workManager,
+               jjcmi.work_manage_phone AS workManagerPhone
+        FROM t_notice_voi tnv
+        LEFT JOIN jj_class_metting_info jjcmi ON tnv.class_id = jjcmi.class_id
+        LEFT JOIN sys_org so ON tnv.org = so.org_id
+        WHERE tnv.sup_type  = '1' AND tnv.`status` NOT IN ('7','8') AND tnv.is_flag = '0'
+        <if test="proName!=null and proName!=''">
+            AND INSTR(tnv.pro_name,#{proName}) > 0
+        </if>
+    </select>
 </mapper>