Merge branch 'V0.0.3' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.3

# Conflicts:
#	project_data/sql/0.0.3/soc/soc.sql

project_data/sql/0.0.3/soc/soc.sql

@@ -1257,6 +1257,30 @@ CREATE TABLE if not exists `core_out_in_record` (
     PRIMARY KEY (`id`),
     KEY `index_letter_id` (`letter_id`) USING BTREE
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='人员出入登记表';
-	
+
+-- 出入管理相关字典
+
+DELETE FROM `sys_dict_type` where dict_type='out_in_type';
+DELETE FROM `sys_dict_data` where dict_type='out_in_type';
+INSERT INTO `sys_dict_type` (`dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( '出入类型', 'out_in_type', '0', 'zlsls01', '2023-11-08 17:24:55', '', 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, '职能部门出入', '1', 'out_in_type', NULL, 'default', 'N', '0', 'zlsls01', '2023-11-08 17:25:16', '', 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, '临时出入', '2', 'out_in_type', NULL, 'default', 'N', '0', 'zlsls01', '2023-11-08 17:25:24', '', 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, '紧急出入', '3', 'out_in_type', NULL, 'default', 'N', '0', 'zlsls01', '2023-11-08 17:25:32', '', NULL, NULL);
+
+DELETE FROM `sys_dict_type` where dict_type='out_in_approve_status';
+DELETE FROM `sys_dict_data` where dict_type='out_in_approve_status';
+INSERT INTO `sys_dict_type` (`dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ('出入申请审批状态', 'out_in_approve_status', '0', 'zlsls01', '2023-11-08 17:27:43', '', 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', 'out_in_approve_status', NULL, 'default', 'N', '0', 'zlsls01', '2023-11-08 17:28:10', '', 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', 'out_in_approve_status', NULL, 'default', 'N', '0', 'zlsls01', '2023-11-08 17:28:20', '', 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', 'out_in_approve_status', NULL, 'default', 'N', '0', 'zlsls01', '2023-11-08 17:28:28', '', 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 (3, '已逾期', '3', 'out_in_approve_status', NULL, 'default', 'N', '0', 'zlsls01', '2023-11-08 17:28:34', '', NULL, NULL);
+
+DELETE FROM `sys_dict_type` where dict_type='letter_status';
+DELETE FROM `sys_dict_data` where dict_type='letter_status';
+INSERT INTO `sys_dict_type` (`dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ('介绍信状态', 'letter_status', '0', '超级管理员', '2023-10-13 15:29:50', '', 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', 'letter_status', NULL, 'default', 'N', '0', '超级管理员', '2023-10-13 15:30:40', 'zlsls01', '2023-11-08 11:04:29', 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', 'letter_status', NULL, 'default', 'N', '0', '超级管理员', '2023-10-13 15:31:04', 'zlsls01', '2023-11-08 11:04:36', 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', 'letter_status', NULL, 'default', 'N', '0', '超级管理员', '2023-10-13 15:31:17', 'zlsls01', '2023-11-08 11:04:41', NULL);
+
 -- 删除多余的表
 drop TABLE if EXISTS sys_bank_physical_defense_construction;

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysUserInformation.java

@@ -65,7 +65,7 @@ public class SysUserInformation extends BaseEntity {
      * 是否专职0是1否
      */
     @ApiModelProperty(value = "是否专职0是1否")
-    private String isFullTime = "1";
+    private String isFullTime = "Y";
 
     /**
      * 最高学历

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/letter/vo/CoreIntroduceLetterVo.java

@@ -95,10 +95,13 @@ public class CoreIntroduceLetterVo {
     @ApiModelProperty(value = "备注")
     private String description;
 
-    private List<CoreIntroduceLetterUserAddDto> userInfos;
+//    private List<CoreIntroduceLetterUserAddDto> userInfos;
     @ApiModelProperty(value = "接待机构")
     private List<Long> receptionOrgIds;
 
     @ApiModelProperty(value = "接待机构名称")
     private String receptionOrgNames;
+
+    @ApiModelProperty(value = "是否已经有出入记录")
+    private boolean haveOutInRecord;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/mapper/CoreOutInRecordMapper.java

@@ -67,4 +67,8 @@ public interface CoreOutInRecordMapper extends BaseMapper<CoreOutInRecord> {
      * @return 结果
      */
     int deleteCoreOutInRecordByIds(Long[] ids);
+
+    List<CoreOutInRecord> findLetterOutInRecordList(Long[] ids);
+
+
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreIntroduceLetterServiceImpl.java

@@ -11,16 +11,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.ErrorMsgConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
-import com.xunmei.common.core.domain.letter.domain.CoreIntroduceLetter;
-import com.xunmei.common.core.domain.letter.domain.CoreIntroduceLetterApproveLog;
-import com.xunmei.common.core.domain.letter.domain.CoreIntroduceLetterToOrg;
-import com.xunmei.common.core.domain.letter.domain.CoreIntroduceLetterUser;
+import com.xunmei.common.core.domain.letter.domain.*;
 import com.xunmei.common.core.domain.letter.dto.*;
 import com.xunmei.common.core.domain.letter.vo.*;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.letter.mapper.CoreIntroduceLetterMapper;
+import com.xunmei.core.letter.mapper.CoreOutInRecordMapper;
 import com.xunmei.core.letter.service.ICoreIntroduceLetterService;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
@@ -42,6 +40,11 @@ import java.util.stream.Collectors;
 public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLetterMapper, CoreIntroduceLetter> implements ICoreIntroduceLetterService {
     @Resource
     private CoreIntroduceLetterMapper coreIntroduceLetterMapper;
+
+    @Resource
+    private CoreOutInRecordMapper coreOutInRecordMapper;
+
+
     @Resource
     private RemoteOrgService orgService;
 
@@ -128,15 +131,19 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
 
 
     private Page<CoreIntroduceLetterVo> buildPageVo(Page<CoreIntroduceLetterVo> page, List<SysOrg> orgList) {
-        List<CoreIntroduceLetterToOrg> toOrgList = coreIntroduceLetterMapper.findToOrgListA(page.getRecords());
         List<CoreIntroduceLetterVo> records = page.getRecords();
-        for (CoreIntroduceLetterVo record : records) {
-             List<Long> orgIds = toOrgList.stream().filter(toOrg -> toOrg.getLetterId().equals(record.getId())).map(CoreIntroduceLetterToOrg::getOrgId).collect(Collectors.toList());
-             String  orgNames = orgIds.stream().map(orgId -> orgList.stream().filter(org -> org.getId().equals(orgId)).findFirst().get().getShortName()).collect(Collectors.joining(","));
-             record.setReceptionOrgIds(orgIds);
-             record.setReceptionOrgNames(orgNames);
+        if (ObjectUtil.isNotEmpty(records)) {
+            List<CoreIntroduceLetterToOrg> toOrgList = coreIntroduceLetterMapper.findToOrgListA(page.getRecords());
+            List<CoreOutInRecord> letterOutInRecordList = coreOutInRecordMapper.findLetterOutInRecordList(records.stream().map(x -> x.getId()).collect(Collectors.toList()).toArray(new Long[records.size()]));
+            for (CoreIntroduceLetterVo record : records) {
+                List<Long> orgIds = toOrgList.stream().filter(toOrg -> toOrg.getLetterId().equals(record.getId())).map(CoreIntroduceLetterToOrg::getOrgId).collect(Collectors.toList());
+                String orgNames = orgIds.stream().map(orgId -> orgList.stream().filter(org -> org.getId().equals(orgId)).findFirst().get().getShortName()).collect(Collectors.joining(","));
+                record.setReceptionOrgIds(orgIds);
+                record.setReceptionOrgNames(orgNames);
+                record.setHaveOutInRecord(letterOutInRecordList.stream().anyMatch(x->ObjectUtil.equal(x.getLetterId(),record.getId())));
+            }
         }
-      return page;
+        return page;
     }
 
 

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

@@ -242,6 +242,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         for (AppPlan ap :
                 appPlans) {
 //修改计划状态为停用
+            ap.setBuildTaskNow(0);
             ap.setPlanStatus(2);
             baseMapper.updateById(ap);
 
@@ -252,6 +253,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         //设置下发状态为未下发
         plan.setDistribute("0");
         plan.setPlanStatus(2);
+        plan.setBuildTaskNow(0);
         baseMapper.updateById(plan);
 
         if (ObjectUtil.notEqual(plan.getTaskHasCompleted(), 1)) {

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

@@ -232,6 +232,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
         for (CoreSafecheckPlan ap :
                 appPlans) {
 //修改计划状态为停用
+            ap.setBuildTaskNow(false);
             ap.setPlanStatus(2L);
             baseMapper.updateById(ap);
 
@@ -251,6 +252,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
         }
         //设置下发状态为未下发
         plan.setDistribute("0");
+        plan.setBuildTaskNow(false);
         plan.setPlanStatus(2L);
         baseMapper.updateById(plan);
 

soc-modules/soc-modules-core/src/main/resources/mapper/letter/CoreOutInRecordMapper.xml

@@ -161,4 +161,10 @@
             #{id}
         </foreach>
     </delete>
+    <select id="findLetterOutInRecordList" resultType="com.xunmei.common.core.domain.letter.domain.CoreOutInRecord">
+        select * from core_out_in_record where 1=1 and letter_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
 </mapper>

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

@@ -164,7 +164,7 @@ public class SysAreaServiceImpl extends ServiceImpl<ISysAreaMapper, SysArea> imp
         queryWrapper.eq("name", sysArea.getName());
         queryWrapper.eq("del_flag", 0);
         SysArea sysArea1 = baseMapper.selectOne(queryWrapper);
-        if (null != sysArea1 && sysArea1.getId() != sysArea.getId()) {
+        if (null != sysArea1 && !sysArea1.getId().equals(sysArea.getId())) {
             throw new ServiceException("名称不能重复");
         }
         sysArea.setUpdateTime(DateUtils.getNowDate());

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

@@ -21,26 +21,24 @@ public class UserExport {
     @ExcelProperty(value = "序号", index = 0)
     @TableField(exist = false)
     private String xh;
-    @ExcelProperty(value = "用户账号", index = 1)
+    @ExcelProperty(value = "账号", index = 1)
     private String username;
-    @ExcelProperty(value = "用户姓名", index = 2)
+    @ExcelProperty(value = "姓名", index = 2)
     private String name;
     @ExcelProperty(value = "所属机构", index = 3)
     private String orgName;
     @ExcelProperty(value = "用户角色", index = 4)
     private String roleNames;
-    @ExcelProperty(value = "手机号码", index = 5)
-    private String phone;
-    @ExcelProperty(value = "性别", index = 6, converter = GenderConverter.class)
-    private String gender;
-    @ExcelProperty(value = "状态", index = 7, converter = UserStatusConverter.class)
+    @ExcelProperty(value = "账号状态", index = 5, converter = UserStatusConverter.class)
     private String isLock;
-    @ExcelProperty(value = "安保部门从业人员", index = 8, converter = UserManagerConverter.class)
-    private String isManage;
-
-    @ExcelProperty(value = "登录IP", index = 9)
+    @ExcelProperty(value = "登录IP", index = 6)
     private String lastIp;
-    @ExcelProperty(value = "登录时间", index = 10)
+    @ExcelProperty(value = "登录时间", index = 7)
     private Date lastTime;
-
+    @ExcelProperty(value = "安保部门从业人员", index = 8, converter = UserManagerConverter.class)
+    private String isManage;
+    @ExcelProperty(value = "手机号码", index = 9)
+    private String phone;
+    @ExcelProperty(value = "性别", index = 10, converter = GenderConverter.class)
+    private String gender;
 }

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

@@ -21,9 +21,9 @@ public class UserImport {
     @ExcelProperty(value = "序号", index = 0)
     @TableField(exist = false)
     private String xh;
-    @ExcelProperty(value = "用户账号", index = 1)
+    @ExcelProperty(value = "账号", index = 1)
     private String username;
-    @ExcelProperty(value = "用户姓名", index = 2)
+    @ExcelProperty(value = "姓名", index = 2)
     private String name;
     @ExcelProperty(value = "所属机构", index = 3)
     private String orgName;
@@ -33,7 +33,7 @@ public class UserImport {
     private String phone;
     @ExcelProperty(value = "性别", index = 6)
     private String gender;
-    @ExcelProperty(value = "状态", index = 7)
+    @ExcelProperty(value = "账号状态", index = 7)
     private String isLock;
     @ExcelProperty(value = "安保部门从业人员", index = 8)
     private String isManage;

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

@@ -80,7 +80,7 @@
         <if test="sysAreaCheck.orgType !=null">
             and org_type=#{sysAreaCheck.orgType}
         </if>
-
+        ORDER BY create_time desc
     </select>