app外包评价

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/dto/EvaluateTaskDTO.java

@@ -30,4 +30,6 @@ public class EvaluateTaskDTO extends BaseEntity {
     @ApiModelProperty(value = "结束时间")
     private Date endTime;
     private String date;
+    private String sDate;
+    private String eDate;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -100,6 +100,8 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         if (StringUtils.isEmpty(evaluateTaskDTO.getStatus())) {
             evaluateTaskDTO.setStatus(null);
         }
+        evaluateTaskDTO.setEDate(evaluateTaskDTO.getDate()+" 23:59:59");
+        evaluateTaskDTO.setSDate(evaluateTaskDTO.getDate()+" 00:00:00");
         page = baseMapper.selectAppPageList(page, evaluateTaskDTO);
         return TableDataInfo.build(page);
     }

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluateTaskMapper.xml

@@ -180,7 +180,11 @@
             and a.status = #{request.status}
         </if>
         <if test="request.date != null and request.date != ''">
-            and e.complete_time like concat( #{request.date}, '%')
+         /*   and e.complete_time like concat( #{request.date}, '%')*/
+            AND ((
+            a.start_time  &lt;= #{request.sDate} AND a.end_time >= #{request.sDate}
+            )
+            OR ( a.start_time  &lt;= #{request.eDate} AND a.end_time >= #{request.eDate}  ))
         </if>
         GROUP BY a.id
     </select>

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysOrgService.java

@@ -9,6 +9,7 @@ import com.xunmei.system.api.vo.FindOrgTypes;
 import com.xunmei.system.api.vo.SysOrgVO;
 import com.xunmei.system.util.ConstructionDetailExport;
 import com.xunmei.system.util.OrgPhysicalDefenseConstructionExport;
+import com.xunmei.system.util.SecurityWorkExport;
 
 import java.util.List;
 
@@ -92,7 +93,7 @@ public interface ISysOrgService extends IService<SysOrg> {
      * @return
      */
     List<OrgPhysicalDefenseConstructionExport> excel(SysOrg dept);
-
+List<SecurityWorkExport>securityWorkExport(SysOrg sysOrg);
     List<SysOrg> selectSysOrgByPathAndType(String path, Integer type);
 
     List<ConstructionDetailExport> selectConstructionDetail(SysOrg dept);

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -29,6 +29,7 @@ import com.xunmei.system.mapper.SysUserMapper;
 import com.xunmei.system.service.ISysOrgService;
 import com.xunmei.system.util.ConstructionDetailExport;
 import com.xunmei.system.util.OrgPhysicalDefenseConstructionExport;
+import com.xunmei.system.util.SecurityWorkExport;
 import io.netty.util.internal.StringUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -144,6 +145,36 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     }
 
     @Override
+    public List<SecurityWorkExport> securityWorkExport(SysOrg sysOrg) {
+        if (null == sysOrg.getId()) {
+            sysOrg.setId(SecurityUtils.getLoginUser().getOrgId());
+        }
+        SysOrg sysOrg2 = baseMapper.selectSysOrgById(sysOrg.getId());
+        List<SysOrg> sysOrgs;
+        if (sysOrg2.getType() < 3 || sysOrg2.getShortName().endsWith("地区行社") || sysOrg2.getType() == 9) {
+            sysOrgs = this.selectSysOrgByPathAndType(sysOrg.getPath(), 3);
+        } else if (sysOrg.getType() == 3) {
+            sysOrgs =this.selectSysOrgByPathAndType(sysOrg.getPath(), 4);
+        } else {
+            return Collections.emptyList();
+        }
+        List<SecurityWorkExport>securityWorkExportList=new ArrayList<>();
+        sysOrgs.forEach(s->{
+            SecurityWorkExport securityWorkExport=new SecurityWorkExport();
+            SysOrg sysOrg1;
+            if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社") || sysOrg.getType() == 9) {
+                sysOrg1 = baseMapper.selectSysOrgById(s.getParentId());
+            } else {
+                sysOrg1 =  baseMapper.selectSysOrgById( baseMapper.selectSysOrgById(s.getParentId()).getParentId());
+                if (-1 == sysOrg1.getShortName().indexOf("地区行社")) {
+                    sysOrg1 = baseMapper.selectSysOrgById(baseMapper.selectSysOrgById(baseMapper.selectSysOrgById(s.getParentId()).getParentId()).getParentId());
+                }
+            }
+        });
+        return null;
+    }
+
+    @Override
     public List<SysOrg> selectSysOrgByPathAndType(String path, Integer type) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.likeRight("path", path);
@@ -159,7 +190,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         }
         List<ConstructionDetailExport> constructionDetailExports = baseMapper.selectConstructionDetail(dept.getPath());
         //hang
-        constructionDetailExports.forEach(c->{
+        constructionDetailExports.forEach(c -> {
             SysOrg sysOrg = baseMapper.selectSysOrgById(c.getOrgId());
             c.setAddress(sysOrg.getAddress());
             c.setNetworkName(sysOrg.getShortName());
@@ -176,8 +207,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
 //                    }
 //                }
 //            }else {
-                sysOrg2 = baseMapper.selectSysOrgById(sysOrg1.getParentId());
-           // }
+            sysOrg2 = baseMapper.selectSysOrgById(sysOrg1.getParentId());
+            // }
             c.setCity(sysOrg2.getShortName().indexOf("地区行社") == -1 ? sysOrg2.getShortName().substring(0, 2) : sysOrg2.getShortName().split("地区行社")[0]);
         });
         return constructionDetailExports;

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/SecurityWorkExport.java

@@ -9,6 +9,7 @@ import lombok.Data;
 
 /**
  * 安全保卫工作情况统计
+ *
  * @author :LuoWei
  * @date : 2023/11/29
  */
@@ -29,7 +30,7 @@ public class SecurityWorkExport {
     @ExcelProperty(value = "营业网点达标数量（符合GA38-2015、2021标准）", index = 4)
     private Integer reachNumber;
     @ExcelProperty(value = "自有产权网点数", index = 5)
-private Integer ownPropertyNumber;
+    private Integer ownPropertyNumber;
     @ExcelProperty(value = "区域外网点数", index = 6)
     private Integer areaOutsideNumber;
     @ExcelProperty(value = "业务库总量", index = 7)
@@ -45,7 +46,7 @@ private Integer ownPropertyNumber;
     @ExcelProperty(value = "保管箱库", index = 7)
     private Integer collectLibrary;
     @ExcelProperty(value = "在行式总量", index = 7)
-   private Integer  onLineTotal;
+    private Integer onLineTotal;
     @ExcelProperty(value = "在行式达标数量（符合GA38-2021标准）", index = 7)
     private Integer onLineReachNumber;
     @ExcelProperty(value = "离行式总量", index = 7)
@@ -53,17 +54,17 @@ private Integer ownPropertyNumber;
     @ExcelProperty(value = "离行式达标数量（符合GA38-2021标准）", index = 7)
     private Integer departureReachNumber;
     @ExcelProperty(value = "自助设备总数", index = 7)
-   private Integer  selfServiceDevicesTotal;
+    private Integer selfServiceDevicesTotal;
     @ExcelProperty(value = "在行大堂式机具", index = 7)
-    private Integer  onLineLobbyImplement;
+    private Integer onLineLobbyImplement;
     @ExcelProperty(value = "在行式穿墙式机具", index = 7)
-    private Integer   onLineThroughWalls;
+    private Integer onLineThroughWalls;
     @ExcelProperty(value = "离行式大堂式机具", index = 7)
-  private Integer  departureLobbyImplement;
+    private Integer departureLobbyImplement;
     @ExcelProperty(value = "离行式穿墙式机具", index = 7)
- private Integer    departureThroughWalls;
+    private Integer departureThroughWalls;
     @ExcelProperty(value = "中心建设时间（年）", index = 7)
-   private String centerConstructionTime;
+    private String centerConstructionTime;
     @ExcelProperty(value = "监控平台最近一次升级改造时间（年", index = 7)
     private String transformTime;
     @ExcelProperty(value = "监控中心平台品牌", index = 7)
@@ -71,7 +72,7 @@ private Integer ownPropertyNumber;
     @ExcelProperty(value = "视频监控摄像头总路数", index = 7)
     private Integer cameraTotal;
     @ExcelProperty(value = "是否实现远程控制和实时授权的功能", index = 7)
-   private String remoteControl;
+    private String remoteControl;
     @ExcelProperty(value = "本地值守网点数量(由员工进行同楼异地值守)", index = 7)
     private Integer localDutyNetworkNumber;
     @ExcelProperty(value = "异地值守网点数量（由监控中心进行远程值守）", index = 7)
@@ -83,7 +84,7 @@ private Integer ownPropertyNumber;
     @ExcelProperty(value = "其中，内部保安人数（含派遣）", index = 7)
     private Integer internalCertificateNumber;
     @ExcelProperty(value = "其中，外聘保安人数", index = 7)
-    private Integer  outsourceCertificateNumber;
+    private Integer outsourceCertificateNumber;
     @ExcelProperty(value = "配有保安网点数 ", index = 7)
     private Integer haveSecurityNetworkNumber;
     @ExcelProperty(value = "本季度辖内所有营业网点组织开展自查次数（每个网点检查数量的累计数）", index = 7)
@@ -102,21 +103,4 @@ private Integer ownPropertyNumber;
     private Integer quarterAllNetworkDrillPeopleNumber;
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 }