Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

project_data/sql/0.0.2/soc/soc.sql

@@ -2039,6 +2039,21 @@ update sys_menu set menu_name ='知识库标签管理' where id=2038;
 update sys_menu set menu_name ='知识库管理' where id=2045;
 update sys_menu set menu_name ='培训计划管理' where id=2059;
 update sys_menu set menu_name ='培训任务管理' where id=2079;
+-- 更新安全检查菜单名称
+UPDATE sys_menu set menu_name ='安全检查管理' WHERE  menu_name='安全检查' and platform_type=1;
+UPDATE sys_menu set menu_name ='检查内容库定义' WHERE  menu_name='安全检查内容库定义' and platform_type=1;
+UPDATE sys_menu set menu_name ='查询' WHERE  menu_name='安全检查内容库定义查询' and platform_type=1;
+UPDATE sys_menu set menu_name ='新增' WHERE  menu_name='安全检查内容库定义新增' and platform_type=1;
+UPDATE sys_menu set menu_name ='编辑' WHERE  menu_name='安全检查内容库定义编辑' and platform_type=1;
+UPDATE sys_menu set menu_name ='删除' WHERE  menu_name='安全检查内容库定义删除' and platform_type=1;
+UPDATE sys_menu set menu_name ='检查内容库管理' WHERE  menu_name='安全检查内容库管理' and platform_type=1;
+UPDATE sys_menu set menu_name ='查询' WHERE  menu_name='安全检查内容库管理查询' and platform_type=1;
+UPDATE sys_menu set menu_name ='新增' WHERE  menu_name='安全检查内容库管理新增' and platform_type=1;
+UPDATE sys_menu set menu_name ='编辑' WHERE  menu_name='安全检查内容库管理编辑' and platform_type=1;
+UPDATE sys_menu set menu_name ='删除' WHERE  menu_name='安全检查内容库管理删除' and platform_type=1;
+UPDATE sys_menu set menu_name ='检查计划管理' WHERE  menu_name='检查计划' and platform_type=1;
+UPDATE sys_menu set menu_name ='检查任务管理' WHERE  menu_name='检查任务' and platform_type=1;
+
 
 UPDATE`sys_dict_data` SET `dict_label` = '待确认' WHERE `dict_code` = 360;
 UPDATE `sys_dict_data` SET `dict_label` = '待履职' WHERE `dict_code` = 194;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/ApiPlanController.java

@@ -72,7 +72,7 @@ public class ApiPlanController {
             appPlanService.distributeToOrg(dto);
             AppPlanVo plan = appPlanService.findById(dto.getId());
             //如果选择了计划立即生效
-            if (plan.isBuildTaskNow()) {
+            if (plan.getBuildTaskNow()==1) {
                 DateTime datetime = new DateTime();
                 datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
                 //当有周期存在时保持原有接口不变（doTask），否则按照新的接口创建
@@ -148,7 +148,7 @@ public class ApiPlanController {
         try {
             appPlanService.saveOrUpdatePlan(info);
             //立即执行
-            if (info.getOrgType()==3&&info.isBuildTaskNow()) {
+            if (info.getExecOrgType()==3&&info.getBuildTaskNow()==1) {
                 DateTime datetime = new DateTime();
                 datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
                 //当有周期存在时保持原有接口不变（doTask），否则按照新的接口创建

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

@@ -158,7 +158,7 @@ public class AppPlan extends Model<AppPlan> implements Serializable {
 
     @TableField(exist = false)
     private String orgId;
-    private boolean buildTaskNow;
+    private Integer buildTaskNow;
 
     @TableLogic(value = "0", delval = "1")
     @ApiModelProperty(value = "是否删除 1是 0否")

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

@@ -180,6 +180,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         plan.setId(dto.getId());
         plan.setDistribute("1");
         plan.setPlanStatus(1);
+        plan.setBuildTaskNow(null);
         baseMapper.updateById(plan);
     }
 
@@ -220,6 +221,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         //设置下发状态为下发
         plan.setDistribute("1");
         plan.setPlanStatus(1);
+
         baseMapper.updateById(plan);
         return 1;
     }
@@ -280,12 +282,12 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
                 throw new RuntimeException("计划名称重复，请确认！");
             }
             //如果计划为行社并且勾选立即生效
-            if (app.getOrgType()==3&&app.isBuildTaskNow()) {
+            if (app.getExecOrgType() == 3 && app.getBuildTaskNow()==1) {
                 plan.setPlanStatus(1);
             } else {
                 plan.setPlanStatus(0);
             }
-            plan.setBuildTaskNow(app.isBuildTaskNow());
+            plan.setBuildTaskNow(app.getBuildTaskNow());
             plan.setDistribute("0");
             baseMapper.insert(plan);
             Long id = plan.getId();
@@ -604,7 +606,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         plan.setExecOrgType(app.getExecOrgType());
         plan.setDistributePlanStatus(app.getDistributePlanStatus());
         plan.setCount(app.getCount());
-
+        plan.setBuildTaskNow(app.getBuildTaskNow());
         return plan;
     }
 
@@ -637,6 +639,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
 
         plan.setId(app.getId());
         plan.setNotResumptionOnRest(app.getNotResumptionOnRest());
+        plan.setBuildTaskNow(app.getBuildTaskNow());
         return plan;
     }
 

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

@@ -23,7 +23,7 @@ public class AppPlanVo extends PageDto<AppPlan> {
 
     private List<Long> ids;
     private Long id;
-    private boolean buildTaskNow;
+    private Integer buildTaskNow;
     /**
      * 计划名称
      */

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

@@ -62,6 +62,15 @@ public class CoreSafecheckPlanToExecOrgController extends BaseController {
     }
 
     /**
+     * 获取计划指定检查机构的行社列表。非指定机构返回空列表
+     * @return
+     */
+    @GetMapping(value = "/designatehangshe/{planId}")
+    public AjaxResult getDesignateHangshe(@PathVariable Long planId){
+        return success(coreSafecheckPlanToExecOrgService.getDesignateHangshe(planId));
+    }
+
+    /**
      * 新增常规安全检查-检查机构关系
      */
     @ApiOperation(value = "新增CoreSafecheckPlanToExecOrg")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/job/SafetyCheckJobBusiness.java

@@ -354,10 +354,10 @@ public class SafetyCheckJobBusiness {
             checkTask.setTitle(taskPlan.getPlanName());
             checkTask.setExceptionCount(0L);
             checkTask.setOrgId(taskPlan.getExecOrg().getId());
-            checkTask.setOrgName(taskPlan.getExecOrg().getName());
+            checkTask.setOrgName(taskPlan.getExecOrg().getShortName());
             checkTask.setOrgPath(taskPlan.getExecOrg().getPath());
             checkTask.setCheckOrgId(taskPlan.getCheckOrg().getId());
-            checkTask.setCheckOrgName(taskPlan.getCheckOrg().getName());
+            checkTask.setCheckOrgName(taskPlan.getCheckOrg().getShortName());
             checkTask.setStatus(1);
             checkTask.setCheckType(0L);
             checkTask.setCheckCycle(Long.valueOf(taskPlan.getPlanCycle()));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/ICoreSafecheckPlanToExecOrgService.java

@@ -2,10 +2,12 @@ package com.xunmei.core.safetyCheck.service;
 
 import java.util.List;
 
+import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.core.safetyCheck.domain.CoreSafecheckPlanToExecOrg;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.system.api.domain.SysOrg;
 
 /**
  * 常规安全检查-检查机构关系Service接口
@@ -23,6 +25,12 @@ public interface ICoreSafecheckPlanToExecOrgService extends IService<CoreSafeche
      CoreSafecheckPlanToExecOrg selectCoreSafecheckPlanToExecOrgByPlanId(Long planId);
 
     /**
+     * 获取计划指定检查机构的行社列表。非指定机构返回空列表
+     * @return
+     */
+     List<SysOrg> getDesignateHangshe(Long planId);
+
+    /**
      * 查询常规安全检查-检查机构关系列表
      *
      * @param coreSafecheckPlanToExecOrg 常规安全检查-检查机构关系

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanToExecOrgServiceImpl.java

@@ -1,15 +1,23 @@
 package com.xunmei.core.safetyCheck.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.utils.DateUtils;
+import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.core.safetyCheck.domain.CoreSafecheckPlanToExecOrg;
 import com.xunmei.core.safetyCheck.mapper.CoreSafecheckPlanToExecOrgMapper;
 import com.xunmei.core.safetyCheck.service.ICoreSafecheckPlanToExecOrgService;
+import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.domain.SysOrg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
+import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -26,8 +34,8 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 public class CoreSafecheckPlanToExecOrgServiceImpl extends ServiceImpl<CoreSafecheckPlanToExecOrgMapper, CoreSafecheckPlanToExecOrg> implements ICoreSafecheckPlanToExecOrgService {
     @Autowired
     private CoreSafecheckPlanToExecOrgMapper coreSafecheckPlanToExecOrgMapper;
-//    @Autowired
-//    private ISysOrgService orgService;
+    @Autowired
+    private RemoteOrgService remoteOrgService;
 
     @Override
     public TableDataInfo<CoreSafecheckPlanToExecOrg> selectPage(CoreSafecheckPlanToExecOrg coreSafecheckPlanToExecOrg) {
@@ -75,6 +83,25 @@ public class CoreSafecheckPlanToExecOrgServiceImpl extends ServiceImpl<CoreSafec
     }
 
     /**
+     * 获取计划指定检查机构的行社列表。非指定机构返回空列表
+     * @return
+     */
+    @Override
+    public  List<SysOrg> getDesignateHangshe(Long planId){
+        LambdaQueryWrapper<CoreSafecheckPlanToExecOrg> wrapper= new LambdaQueryWrapper<CoreSafecheckPlanToExecOrg>();
+        wrapper.eq(CoreSafecheckPlanToExecOrg::getPlanId,planId);
+        List<CoreSafecheckPlanToExecOrg> data= baseMapper.selectList(wrapper);
+        if(CollectionUtil.isEmpty(data)){
+            return  new ArrayList<>();
+        }
+
+        List<Long> orgIds= data.stream().map(CoreSafecheckPlanToExecOrg::getOrgId).collect(Collectors.toList());
+        List<SysOrg> hsOrgs= remoteOrgService.selectParentHs(orgIds, SecurityConstants.INNER);
+
+        return hsOrgs;
+    }
+
+    /**
      * 查询常规安全检查-检查机构关系列表
      *
      * @param coreSafecheckPlanToExecOrg 常规安全检查-检查机构关系

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -211,7 +211,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         // 找出检查内容
         List<AppTaskRegisterPointVo> points = baseMapper.selectPoint(plan.getId(), id);
         Map<Long, List<CoreSafetyTaskDataRemarkimg>> taskImgs = new HashMap<>();
-        if (ObjectUtil.equal(task.getStatus(), SafetyCheckTaskStatus.UnderWay.getValue())) {
+        if (ObjectUtil.notEqual(task.getStatus(), SafetyCheckTaskStatus.Waiting.getValue())) {
             //已保存未提交的才可能有问题图片
             LambdaQueryWrapper<CoreSafetyTaskDataRemarkimg> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(CoreSafetyTaskDataRemarkimg::getTaskId, id);

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

@@ -196,7 +196,7 @@ update   core_resumption set name=#{planName} where plan_id =#{planId}
             b.scan_method,
             b.img
         FROM
-            ( SELECT area_id, collection_area_name, CODE, id FROM sys_nfc_bind WHERE area_id =#{areaId} AND org_id = #{orgId} ) a
+            ( SELECT area_id, collection_area_name, CODE, id FROM sys_nfc_bind WHERE area_id =#{areaId} AND org_id = #{orgId} and del_flag='0' ) a
             LEFT JOIN ( SELECT nfc_id, point_id, img, STATUS, scan_method FROM core_resumption_data_nfc WHERE resumption_id = #{resumptionId} ) b ON a.id = b.nfc_id
 
     </select>

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -199,8 +199,8 @@
     <select id="selectCoreSafetyTaskPage" resultType="com.xunmei.core.safetyCheck.domain.CoreSafetyTask">
         SELECT t.id,
         t.title,
-        o1.`name` as org_name,
-        o2.`name` as check_org_name,
+        o1.`short_name` as org_name,
+        o2.`short_name` as check_org_name,
         u1.name as submit_name,
         r1.role_name as role_name,
         t.plan_id,

soc-modules/soc-modules-job/src/main/java/com/xunmei/job/service/impl/SysJobServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.ScheduleConstants;
 import com.xunmei.common.core.exception.job.TaskException;
+import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.job.domain.SysJob;
 import com.xunmei.job.mapper.SysJobMapper;
@@ -58,6 +59,15 @@ public class SysJobServiceImpl extends ServiceImpl<SysJobMapper, SysJob> impleme
             page = new Page<>();
         }
         LambdaQueryWrapper<SysJob> where = new LambdaQueryWrapper<SysJob>();
+        if(StringUtils.isNotEmpty(job.getJobName())){
+            where.like(SysJob::getJobName,job.getJobName());
+        }
+        if(StringUtils.isNotEmpty(job.getStatus())){
+            where.like(SysJob::getStatus,job.getStatus());
+        }
+        if(StringUtils.isNotEmpty(job.getJobGroup())){
+            where.like(SysJob::getJobGroup,job.getJobGroup());
+        }
         where.orderByAsc(SysJob::getStatus);
         where.orderByDesc(SysJob::getCreateTime);
         Page<SysJob> list = baseMapper.selectPage(page, where);

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

@@ -650,7 +650,7 @@
             and o.type =#{org.type}
         </if>
         <if test="  org.name != null and org.name !=''">
-            and o.name like concat(concat('%',#{org.name}),'%')
+            and (o.name like concat(concat('%',#{org.name}),'%') or o.short_name like concat(concat('%',#{org.name}),'%'))
         </if>
         <if test="  org.code != null and org.code !=''">
             and o.code like concat(concat('%',#{org.code}),'%')