工作台履职任务今天都可以显示

project_data/sql/0.0.2/soc/soc.sql

@@ -1129,19 +1129,19 @@ END IF;
 			CHANGE COLUMN `plan_id` `parent_plan_id` bigint NULL DEFAULT NULL COMMENT '父计划id，没有就与plan_id一致' AFTER `ymd_minute`,
 			ADD COLUMN `plan_id` bigint NULL COMMENT '生成任务的计划id' AFTER `parent_plan_id`;
     END IF;
-	
+
 	-- 履职库内容表增加NFC点位
     IF
         NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'core_resumption_rule_point' AND COLUMN_NAME = 'check_id' ) THEN
-        ALTER TABLE `core_resumption_rule_point` 
+        ALTER TABLE `core_resumption_rule_point`
 			MODIFY COLUMN `area_id` bigint NULL COMMENT '履职区域,区域表id' AFTER `name`,
 			ADD COLUMN `check_id` bigint NULL COMMENT 'NFC点位id' AFTER `area_id`;
     END IF;
-	
+
 	-- 履职登记内容表增加NFC点位
     IF
         NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'core_resumption_data' AND COLUMN_NAME = 'check_id' ) THEN
-        ALTER TABLE `core_resumption_data` 
+        ALTER TABLE `core_resumption_data`
 			ADD COLUMN `check_id` bigint NULL COMMENT '点位id' AFTER `area_id`;
     END IF;
 
@@ -1157,6 +1157,17 @@ END IF;
         alter table core_drill_task
             add drill_end_time datetime(6) null comment '演练结束时间' after drill_start_time;
     END IF;
+	-- 履职数据增加两个字段，是否必查，是否扫描NFC
+    IF
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'core_resumption_data' AND COLUMN_NAME = 'point_scan' ) THEN
+        ALTER TABLE `core_resumption_data`
+			ADD COLUMN `point_scan` tinyint(1) NULL DEFAULT NULL COMMENT '是否扫描NFC 1扫描，0不扫描' AFTER `data_status`;
+    END IF;
+       IF
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'core_resumption_data' AND COLUMN_NAME = 'required' ) THEN
+        ALTER TABLE `core_resumption_data`
+			ADD COLUMN `required` tinyint(0) NULL DEFAULT 1 COMMENT '是否必须检查 1必检查，0非必捡' AFTER `data_status`;
+    END IF;
 
 
 ALTER TABLE `core_protection` MODIFY COLUMN `device_id` BIGINT NULL DEFAULT NULL COMMENT '设备ID' AFTER `id`;
@@ -2076,6 +2087,14 @@ insert into sys_role_menu select  id,1714187748136493058 from sys_role where rol
 insert into sys_role_menu select  id,1714187851295399937 from sys_role where role_name like '%省联社安全保卫管理人员%';
 insert into sys_role_menu select  id,1714188002965626881 from sys_role where role_name like '%省联社安全保卫管理人员%';
 insert into sys_role_menu select  id,1714188131026116609 from sys_role where role_name like '%省联社安全保卫管理人员%';
+
+delete from sys_dict_type where dict_type='materials_status';
+delete from sys_dict_data where dict_type='materials_status';
+INSERT INTO sys_dict_type ( dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES ('知识库状态', 'materials_status', '0', null, now(), '', null, null);
+INSERT INTO sys_dict_data ( dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES ( 0, '草稿', '0', 'materials_status', null, 'default', 'N', '0', null, now(), '', null, null);
+INSERT INTO sys_dict_data ( dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES ( 1, '使用中', '1', 'materials_status', null, 'default', 'N', '0', null, now(), '', null, null);
+INSERT INTO sys_dict_data ( dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES ( 2, '停用', '2', 'materials_status', null, 'default', 'N', '0', null, now(), '', null, null);
+
 -- -------------------------------------------------------
 -- ----------新增数据 end  ----------------------------
 -- -------------------------------------------------------
@@ -2180,7 +2199,6 @@ update sys_menu set menu_name ='教育培训计划下发' where menu_name='下
 delete from sys_role_menu where role_id in (select id from sys_role  where org_type=4) and menu_id in (select id from sys_menu m where menu_name like '%培训计划%');
 delete from sys_role_menu where role_id in (select id from sys_role  where org_type=4) and menu_id in (select id from sys_menu m where menu_name like '%演练计划%');
 
-
 -- -------------------------------------------------------
 -- ----------更新数据 end  ----------------------------
 -- -------------------------------------------------------

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteUserService.java

@@ -5,7 +5,7 @@ import com.xunmei.common.core.constant.ServiceNameConstants;
 import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.domain.message.domain.CoreAnnouncementNotificationToRole;
 import com.xunmei.common.core.vo.IdNameVo;
-import com.xunmei.system.api.dto.SysRoleOrgDTO;
+import com.xunmei.system.api.dto.SysPlanOrgDTO;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.api.factory.RemoteUserFallbackFactory;
 import com.xunmei.system.api.model.LoginUser;
@@ -72,7 +72,7 @@ public interface RemoteUserService {
     public List<SysUser>  getUserListByRole(@RequestBody List<CoreAnnouncementNotificationToRole> notificationToRoles, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     @PostMapping("/user/userListByRoleAndOrg")
-    public List<SysUser> userListByRoleAndOrg(@RequestBody SysRoleOrgDTO sysRoleOrgDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source) ;
+    public List<SysUser> userListByRoleAndOrg(@RequestBody SysPlanOrgDTO sysRoleOrgDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source) ;
 
     /**
      * 获取用户的角色id及名称

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/SysRoleOrgDTO.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/SysPlanOrgDTO.java

@@ -2,12 +2,14 @@ package com.xunmei.system.api.dto;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author :LuoWei
  * @date : 2023/9/21
  */
 @Data
-public class SysRoleOrgDTO {
+public class SysPlanOrgDTO {
     private Long orgId;
-    private Long roleId;
+    private Long planId;
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteUserFallbackFactory.java

@@ -6,7 +6,7 @@ import com.xunmei.common.core.domain.message.domain.CoreAnnouncementNotification
 import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.system.api.RemoteUserService;
 import com.xunmei.system.api.domain.SysUser;
-import com.xunmei.system.api.dto.SysRoleOrgDTO;
+import com.xunmei.system.api.dto.SysPlanOrgDTO;
 import com.xunmei.system.api.model.LoginUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -72,7 +72,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
             }
 
             @Override
-            public List<SysUser> userListByRoleAndOrg(SysRoleOrgDTO sysRoleOrgDTO, String source) {
+            public List<SysUser> userListByRoleAndOrg(SysPlanOrgDTO sysRoleOrgDTO, String source) {
                 return null;
             }
 

soc-auth/src/main/java/com/xunmei/auth/service/SysPasswordService.java

@@ -64,7 +64,7 @@ public class SysPasswordService
             recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, String.format("密码输入错误%s次", retryCount),platformType);
             RedisUtils.setCacheObject(getCacheKey(username), retryCount, Duration.ofMinutes(lockTime));
             //redisService.setCacheObject(getCacheKey(username), retryCount, lockTime, TimeUnit.MINUTES);
-            throw new ServiceException("用户不存在/密码错误");
+            throw new ServiceException("密码错误");
         }
         else
         {

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillTaskDetailVo.java

@@ -101,11 +101,13 @@ public class CoreDrillTaskDetailVo {
     @ApiModelProperty(value = "任务用户信息", notes = "1:参与人员,2:缺席人员")
     private List<CoreDrillTaskToUser> taskUserList;
 
+/*
     @ApiModelProperty(value = "任务用户信息", notes = "参与人员")
     private List<CoreDrillTaskToUser> absenceList;
 
     @ApiModelProperty(value = "任务用户信息", notes = "缺席人员")
     private List<CoreDrillTaskToUser> absentList;
+*/
 
 
     @ApiModelProperty(value = "登记簿地址")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -225,8 +225,8 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         if (ObjectUtil.isNotEmpty(userList)) {
             detailVo.setTaskUserList(userList);
             Map<Integer, List<CoreDrillTaskToUser>> collect = userList.stream().collect(Collectors.groupingBy(CoreDrillTaskToUser::getType));
-            detailVo.setAbsenceList(collect.get(1));
-            detailVo.setAbsentList(collect.get(2));
+           /* detailVo.setAbsenceList(collect.get(1));
+            detailVo.setAbsentList(collect.get(2));*/
         }
         final List<SysDictData> drillTypeDictList = DictUtils.getDictCache(DictConstants.CORE_DRILL_TYPE);
         if (ObjectUtil.isNotEmpty(drillTypeDictList) && ObjectUtil.isNotEmpty(detailVo.getType())) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/SysLearningMaterialsServiceImpl.java

@@ -61,8 +61,8 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
 
         int checkSelect = checkSelect(request);
         dealParam(request);
-        Page<SysLearningMaterialsPageVo> page=null;
-        switch (checkSelect){
+        Page<SysLearningMaterialsPageVo> page = null;
+        switch (checkSelect) {
             case 1:
                 //不下穿查询其他机构: 仅查询目标机构公开数据
                 page = sysLearningMaterialsMapper.selectPageData1(request.getPageRequest(), request);
@@ -83,14 +83,14 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
                 //下穿查询子机构:查询下级公开数据
                 page = sysLearningMaterialsMapper.selectPageData5(request.getPageRequest(), request);
                 break;
-            default:break;
+            default:
+                break;
         }
-        if (page==null){
+        if (page == null) {
             return TableDataInfo.build();
         }
 
 
-
         for (SysLearningMaterialsPageVo record : page.getRecords()) {
             record.setNo(page.getRecords().indexOf(record));
         }
@@ -295,7 +295,13 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
     public int editOpen(Long id, Integer isOpen) {
         SysLearningMaterials sysLearningMaterials = sysLearningMaterialsMapper.selectById(id);
         if (sysLearningMaterials != null) {
-            sysLearningMaterials.setIsOpen(isOpen);
+            if (isOpen == 1) {
+                //发布：使用中
+                sysLearningMaterials.setIsOpen(isOpen);
+            } else if (isOpen == 0) {
+                //取消发布：停用
+                sysLearningMaterials.setIsOpen(2);
+            }
             sysLearningMaterials.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
             sysLearningMaterials.setUpdateTime(DateUtils.getNowDate());
             return sysLearningMaterialsMapper.updateById(sysLearningMaterials);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/controller/CoreEvaluateTaskController.java

@@ -43,7 +43,7 @@ public class CoreEvaluateTaskController extends BaseController {
     @ApiOperation(value = "统计")
     @RequiresPermissions("core:task:list")
     @GetMapping("/statistics")
-    public TableDataInfo<CoreEvaluateTaskVO> statistics(EvaluateTaskDTO coreEvaluateTask) {
+    public TableDataInfo statistics(EvaluateTaskDTO coreEvaluateTask) {
         return coreEvaluateTaskService.selectPage(coreEvaluateTask);
     }
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/mapper/CoreEvaluateTaskMapper.java

@@ -11,6 +11,7 @@ import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 外包评价任务Mapper接口
@@ -69,4 +70,5 @@ public interface CoreEvaluateTaskMapper extends BaseMapper<CoreEvaluateTask> {
 
     Page<CoreEvaluateTaskVO> selectPageList(@Param("page") Page<CoreEvaluateTaskVO> page, @Param("request") EvaluateTaskDTO request);
 
+    Page<Map> statistics(@Param("page") Page<Map> page, @Param("request") EvaluateTaskDTO request);
 }

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

@@ -75,4 +75,10 @@ public interface ICoreEvaluateTaskService extends IService<CoreEvaluateTask> {
      */
     TableDataInfo<CoreEvaluateTaskVO> selectPage(EvaluateTaskDTO evaluateTaskDTO);
 
+    /**
+     * 统计
+     * @param evaluateTaskDTO
+     * @return
+     */
+    TableDataInfo statistics(EvaluateTaskDTO evaluateTaskDTO);
 }

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

@@ -101,6 +101,12 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         return TableDataInfo.build(page);
     }
 
+    @Override
+    public TableDataInfo statistics(EvaluateTaskDTO evaluateTaskDTO) {
+
+        return null;
+    }
+
     /**
      * 查询外包评价任务
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/service/impl/CoreResumptionConfigurationServiceImpl.java

@@ -7,17 +7,15 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.utils.StringUtils;
-import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.core.information.service.ICoreMessageCenterService;
 import com.xunmei.system.api.RemoteJobService;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.api.dto.SysJobDTO;
-import com.xunmei.system.api.dto.SysRoleOrgDTO;
+import com.xunmei.system.api.dto.SysPlanOrgDTO;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.information.domain.CoreMessageCenter;
 import com.xunmei.core.information.domain.CoreResumptionConfiguration;
-import com.xunmei.core.information.mapper.CoreMessageCenterMapper;
 import com.xunmei.core.resumption.domain.Resumption;
 import com.xunmei.core.resumption.dto.CoreResumptionConfigurationDTO;
 import com.xunmei.core.information.mapper.CoreResumptionConfigurationMapper;
@@ -213,13 +211,12 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         c.set(Calendar.SECOND, 0);
         c.set(Calendar.MILLISECOND, 0);
         c.add(Calendar.DAY_OF_MONTH, time);
-        System.out.print(simpleDateFormat.format(c.getTime()));
         return simpleDateFormat.format(c.getTime());
     }
 
-    private void addMassageCenter(String taskName, String time, String cycle, Long orgId, Long roleId) {
-        SysRoleOrgDTO sysRoleOrgDTO = new SysRoleOrgDTO();
-        sysRoleOrgDTO.setRoleId(roleId);
+    private void addMassageCenter(String taskName, String time, String cycle, Long orgId, Long planId) {
+        SysPlanOrgDTO sysRoleOrgDTO = new SysPlanOrgDTO();
+        sysRoleOrgDTO.setPlanId(planId);
         sysRoleOrgDTO.setOrgId(orgId);
         //根据角色和机构查人
         List<SysUser> sysUsers = remoteUserService.userListByRoleAndOrg(sysRoleOrgDTO, SecurityConstants.INNER);
@@ -275,7 +272,7 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         List<Resumption> resumptions = resumptionMapper.selectDay(getTime(0), "2");
         if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
             resumptions.forEach(r -> {
-                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getRoleId());
+                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getPlanId());
             });
         }
     }
@@ -289,7 +286,7 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         List<Resumption> resumptions = resumptionMapper.selectDay(getTime(0), "3");
         if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
             resumptions.forEach(r -> {
-                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getRoleId());
+                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getPlanId());
             });
         }
     }
@@ -303,7 +300,7 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         List<Resumption> resumptions = resumptionMapper.selectDay(getTime(0), "4");
         if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
             resumptions.forEach(r -> {
-                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getRoleId());
+                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getPlanId());
             });
         }
     }
@@ -317,7 +314,7 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         List<Resumption> resumptions = resumptionMapper.selectDay(getTime(0), "1");
         if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
             resumptions.forEach(r -> {
-                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getRoleId());
+                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getPlanId());
             });
         }
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppResumptionData.java

@@ -85,4 +85,14 @@ public class AppResumptionData extends Model<AppResumptionData> implements Seria
      * 数据状态 1未处理，2已处理
      */
     private Integer dataStatus;
+
+    /**
+     * 是否扫描NFC 1扫描，0不扫描
+     */
+    private  Integer pointScan;
+
+    /**
+     * 是否检查 1检查，0不检查
+     */
+    private Integer required;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/gx/vo/ResumptionPlanVo.java

@@ -49,6 +49,16 @@ public class ResumptionPlanVo {
     private Long pointId;
 
     /**
+     * 是否扫描NFC 1扫描，0不扫描
+     */
+    private  Integer pointScan;
+
+    /**
+     * 是否检查 1检查，0不检查
+     */
+    private Integer required;
+
+    /**
      * 履职内容
      */
     private String pointName;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -634,6 +634,9 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         plan.setDistributePlanStatus(app.getDistributePlanStatus());
         plan.setCount(app.getCount());
         plan.setBuildTaskNow(app.getBuildTaskNow());
+        plan.setPlanCreateOrgId(app.getPlanCreateOrgId());
+        plan.setPlanOfOrgId(app.getPlanOfOrgId());
+        plan.setPlanOfOrgType(app.getPlanOfOrgType());
         return plan;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/ResumptionServiceImpl.java

@@ -187,8 +187,8 @@ public class ResumptionServiceImpl extends ServiceImpl<ResumptionMapper, Resumpt
     @Override
     public List<PanelListVo> selectCurUserTaskList(PanelListDto panelListDto) {
         List<PanelListVo> list = resumptionMapper.selectCurUserTaskList(panelListDto);
-        Date start = DateUtil.beginOfDay(new Date());
-        list.removeIf(item -> DateUtil.compare(start, item.getEndTime()) <= 0);
+        Date end = DateUtil.endOfDay(new Date());
+        list.removeIf(item -> DateUtil.compare(end, item.getEndTime()) <= 0);
         list.forEach(item -> {
             item.setType(PanelTypeEnums.RESUMPTION.getCode());
         });

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appPlan/AppPlanVo.java

@@ -30,7 +30,8 @@ public class AppPlanVo extends PageDto<AppPlan> {
      * 计划名称
      */
     private String planName;
-
+    private Long planOfOrgId;
+    private Long planOfOrgType;
     /**
      * 计划状态
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/CoreSafecheckPlanController.java

@@ -119,7 +119,12 @@ public class CoreSafecheckPlanController extends BaseController {
     @Log(title = "常规安全检查计划", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreSafecheckPlan coreSafecheckPlan) throws Exception {
+
         Long planId = coreSafecheckPlan.getId();
+        //处理无周期
+        if(coreSafecheckPlan.getPlanCycle()==6){
+            coreSafecheckPlan.setBuildTaskNow(true);
+        }
         Long returnId = coreSafecheckPlanService.insertCoreSafecheckPlan(coreSafecheckPlan);
         //判断是否是编辑并且计划所属任务不存在已完成或者逾期,需要删除所有任务重新生成
         boolean isEditAll = coreSafecheckPlan.getHasEdit() == null && planId != null&&coreSafecheckPlan.isBuildTaskNow();

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

@@ -100,6 +100,9 @@ SELECT
         </if>
         GROUP BY a.id
     </select>
+    <select id="statistics" resultType="java.util.Map">
+
+    </select>
 
     <insert id="insertCoreEvaluateTask" parameterType="com.xunmei.core.evaluate.domain.CoreEvaluateTask">
         insert into core_evaluate_task

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppPlanMapper.xml

@@ -398,25 +398,34 @@
         </where>
     </select>
     <select id="selectResumptionPlan" resultType="com.xunmei.core.resumption.gx.vo.ResumptionPlanVo">
-        select q.item_id,
-               q.item_name,
-               q.point_id,
-               q.point_name,
-               q.area_id,
-               w.`name` as area_name,
-               q.check_id,
-               q.plan_id
-        from (select c.id     as item_id,
-                     c.`name` as item_name,
-                     b.id     as point_id,
-                     b.name   as point_name,
-                     b.area_id,
-                     b.check_id,
-                     a.plan_id
-              from core_resumption_plan_to_point a
-                       LEFT JOIN core_resumption_rule_point b on a.point_id = b.id
-                       LEFT JOIN core_resumption_rule_item c on b.item_id = c.id
-              where a.plan_id = #{planId}) q
-                 LEFT JOIN sys_area w on q.area_id = w.id
+        select
+            q.item_id,
+            q.item_name,
+            q.point_id,
+            q.point_name,
+            q.area_id,
+            w.`name` as area_name,
+            q.check_id,
+            q.plan_id,
+            q.point_scan,
+            q.required
+        from
+            (
+                select
+                    c.id as item_id,
+                    c.`name` as item_name,
+                    b.id as point_id,
+                    b.name as point_name,
+                    b.area_id,
+                    b.check_id,
+                    a.plan_id,
+                    a.point_scan,
+					a.required
+                from core_resumption_plan_to_point a
+                         LEFT JOIN core_resumption_rule_point b on a.point_id = b.id
+                         LEFT JOIN core_resumption_rule_item c on b.item_id = c.id
+                where a.plan_id = #{planId}
+            ) q
+                LEFT JOIN sys_area w on q.area_id = w.id
     </select>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/ResumptionMapper.xml

@@ -176,7 +176,9 @@
                a.res_value,
                a.res_remark,
                a.rectification_deadline,
-               a.data_status
+               a.data_status,
+               a.point_scan,
+               a.required
         from (select id as data_id,
                      area_id,
                      check_id,
@@ -184,7 +186,9 @@
                      res_value,
                      res_remark,
                      rectification_deadline,
-                     data_status
+                     data_status,
+                     point_scan,
+                     required
               from core_resumption_data
               where resumption_id = #{resumptionId}) a
                  LEFT JOIN core_resumption_rule_point b on a.item_id = b.id
@@ -238,6 +242,7 @@
                             from core_resumption_plan_to_role pr
                                      inner join core_resumption_plan p
                                                 on pr.plan_id = p.id and p.deleted = 0 and p.plan_status = 1)
+
           and t.status in (1, 2)
           and ((
                            #{request.startTime}   <![CDATA[<=]]> t.plan_start_time

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -25,7 +25,7 @@ import com.xunmei.system.api.model.LoginUser;
 import com.xunmei.system.domain.SysUserRole;
 import com.xunmei.system.domain.vo.SysUserListVo;
 import com.xunmei.system.domain.vo.UserRoleVo;
-import com.xunmei.system.api.dto.SysRoleOrgDTO;
+import com.xunmei.system.api.dto.SysPlanOrgDTO;
 import com.xunmei.system.mapper.SysOrgMapper;
 import com.xunmei.system.service.*;
 import com.xunmei.system.util.UserExport;
@@ -455,7 +455,7 @@ public class SysUserController extends BaseController {
     @ApiOperation(value = "通过角色和机构获取用户")
     @InnerAuth
     @PostMapping("/userListByRoleAndOrg")
-    public List<SysUser> userListByRoleAndOrg(@RequestBody SysRoleOrgDTO sysRoleOrgDTO) {
+    public List<SysUser> userListByRoleAndOrg(@RequestBody SysPlanOrgDTO sysRoleOrgDTO) {
         return userService.selectUserListByRoleAndOrg(sysRoleOrgDTO);
     }
 
@@ -485,8 +485,12 @@ public class SysUserController extends BaseController {
     @PostMapping("/export")
     public void export(SysUser user, HttpServletResponse response) {
         List<UserExport> list=null;
+        Set<String> excludeColumnFiledNames = new HashSet<String>();
+
         //如果导出模板
         if(user.getTemplate()!=null&&user.getTemplate()){
+            excludeColumnFiledNames.add("lastIp");
+            excludeColumnFiledNames.add("lastTime");
             list = new ArrayList<>();
         }else{
             list= userService.down(user);
@@ -513,7 +517,7 @@ public class SysUserController extends BaseController {
             response.setContentType("application/octet-stream;charset=UTF-8");
             response.setCharacterEncoding("utf-8");
             // 数据导出
-            EasyExcel.write(response.getOutputStream(), UserExport.class)
+            EasyExcel.write(response.getOutputStream(), UserExport.class).excludeColumnFiledNames(excludeColumnFiledNames)
                     .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).sheet("用户数据").doWrite(list);
         } catch (Exception e) {
             // 重置response

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysUserMapper.java

@@ -7,7 +7,7 @@ import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.domain.vo.SysUserVO;
-import com.xunmei.system.api.dto.SysRoleOrgDTO;
+import com.xunmei.system.api.dto.SysPlanOrgDTO;
 import com.xunmei.system.util.UserExport;
 import org.apache.ibatis.annotations.Param;
 
@@ -155,7 +155,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     List<SysUser> selectUserListByRole(@Param("notificationToRoles") List<CoreAnnouncementNotificationToRole> notificationToRoles);
 
-    List<SysUser> selectUserListByRoleAndOrg(@Param("sysRoleOrgDTO") SysRoleOrgDTO sysRoleOrgDTO);
+    List<SysUser> selectUserListByRoleAndOrg(@Param("sysRoleOrgDTO") SysPlanOrgDTO sysRoleOrgDTO);
 
     List<UserExport> select(@Param("info") SysUser user);
 

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

@@ -7,7 +7,7 @@ import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.domain.vo.SysUserListVo;
 import com.xunmei.system.domain.vo.SysUserVO;
-import com.xunmei.system.api.dto.SysRoleOrgDTO;
+import com.xunmei.system.api.dto.SysPlanOrgDTO;
 import com.xunmei.system.util.UserExport;
 
 import java.util.List;
@@ -222,7 +222,7 @@ public interface ISysUserService extends IService<SysUser> {
 
     List<SysUser> selectUserListByRole(List<CoreAnnouncementNotificationToRole> notificationToRoles);
 
-    List<SysUser> selectUserListByRoleAndOrg(SysRoleOrgDTO sysRoleOrgDTO);
+    List<SysUser> selectUserListByRoleAndOrg(SysPlanOrgDTO sysRoleOrgDTO);
 
     List<SysUser> selectAllUser(String userName);
 

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

@@ -21,7 +21,7 @@ import com.xunmei.system.domain.SysUserPost;
 import com.xunmei.system.domain.SysUserRole;
 import com.xunmei.system.domain.vo.SysUserListVo;
 import com.xunmei.system.domain.vo.SysUserVO;
-import com.xunmei.system.api.dto.SysRoleOrgDTO;
+import com.xunmei.system.api.dto.SysPlanOrgDTO;
 import com.xunmei.system.mapper.*;
 import com.xunmei.system.service.ISysConfigService;
 import com.xunmei.system.service.ISysOrgService;
@@ -608,7 +608,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public List<SysUser> selectUserListByRoleAndOrg(SysRoleOrgDTO sysRoleOrgDTO) {
+    public List<SysUser> selectUserListByRoleAndOrg(SysPlanOrgDTO sysRoleOrgDTO) {
         return userMapper.selectUserListByRoleAndOrg(sysRoleOrgDTO);
     }
 

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

@@ -18,25 +18,25 @@ import java.util.Date;
 @HeadRowHeight(16) //表头行高
 @ContentRowHeight(16) //数据行高
 public class UserExport {
-    @ExcelProperty(value = "序号", index = 1)
+    @ExcelProperty(value = "序号", index = 0)
     @TableField(exist = false)
     private String xh;
-    @ExcelProperty(value = "用户账号", index = 2)
+    @ExcelProperty(value = "用户账号", index = 1)
     private String username;
-    @ExcelProperty(value = "用户姓名", index = 3)
+    @ExcelProperty(value = "用户姓名", index = 2)
     private String name;
-    @ExcelProperty(value = "所属机构", index = 4)
+    @ExcelProperty(value = "所属机构", index = 3)
     private String orgName;
-    @ExcelProperty(value = "用户角色", index = 5)
+    @ExcelProperty(value = "用户角色", index = 4)
     private String roleNames;
-    @ExcelProperty(value = "手机号码", index = 6)
+    @ExcelProperty(value = "手机号码", index = 5)
     private String phone;
-    @ExcelProperty(value = "状态", index = 7, converter = UserStatusConverter.class)
+    @ExcelProperty(value = "状态", index = 6, converter = UserStatusConverter.class)
     private String isLock;
-    @ExcelProperty(value = "是否管理人员", index = 8, converter = UserManagerConverter.class)
+    @ExcelProperty(value = "是否管理人员", index = 7, converter = UserManagerConverter.class)
     private String isManager;
-    @ExcelProperty(value = "登录IP", index = 9)
+    @ExcelProperty(value = "登录IP", index = 8)
     private String lastIp;
-    @ExcelProperty(value = "登录时间", index = 10)
+    @ExcelProperty(value = "登录时间", index = 9)
     private Date lastTime;
 }

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -609,13 +609,13 @@
             a.deleted = 0
           AND d.del_flag = 0
           AND b.id = #{sysRoleOrgDTO.orgId}
-          AND d.id = #{sysRoleOrgDTO.roleId}
+          AND d.id IN (	SELECT role_id FROM core_resumption_plan_to_role WHERE plan_id=#{sysRoleOrgDTO.planId})
     </select>
     <select id="select" resultType="com.xunmei.system.util.UserExport">
         SELECT
         #         h.user_id AS is_manager,
         GROUP_CONCAT(sr.role_name) role_names,
-        CONCAT(",",GROUP_CONCAT( sr.id ),",") as roleIds,
+        CONCAT(',',GROUP_CONCAT( sr.id ),',') as roleIds,
         u.id,
         u.dept_id,
         u.is_lock,
@@ -683,6 +683,9 @@
         <if test="info.roleId != null and info.roleId != ''">
             AND sr.id =#{info.roleId}
         </if>
+        <if test="info.onlyManager ==true">
+            AND u.is_manage ='Y'
+        </if>
         <if test="info.params.beginTime != null and info.params.beginTime != ''">
             <!-- 开始时间检索 -->
             AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{info.params.beginTime},'%y%m%d')