解决缺陷

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

@@ -466,9 +466,9 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
         }
 
         //815版本需求允许介绍信失效后登记了进入时间的,未登记离开时间,可以随时登记离开时间
-       /* final LambdaQueryWrapper<CoreOutInRecord> oqw1 = new LambdaQueryWrapper<CoreOutInRecord>();
+       final LambdaQueryWrapper<CoreOutInRecord> oqw1 = new LambdaQueryWrapper<CoreOutInRecord>();
         oqw1.notIn(CoreOutInRecord::getStatus, 2,3)
-            .isNull(CoreOutInRecord::getDepartureTime)
+            .isNull(CoreOutInRecord::getArrivalTime)
             .le(CoreOutInRecord::getOutInRequestEffectiveEndTime,currentDate);
         List<CoreOutInRecord> outInRecords = coreOutInRecordMapper.selectList(oqw1);
         if(ObjectUtil.isNotEmpty(outInRecords)){
@@ -476,7 +476,7 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
 
             // 将出入记录设置为已失效状态
             coreOutInRecordMapper.batchUpdateCoreOutInRecordStatus(outInRecords);
-        }*/
+        }
     }
 
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/safetyInspect/service/impl/SafetyInspectServiceImpl.java

@@ -70,7 +70,7 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
         }
         if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社") || sysOrg.getType() == 9) {
             sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
-        } else if (sysOrg.getType() == 3) {
+        } else if (sysOrg.getType() == 3 || sysOrg.getType() == 4) {
             sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
         } else {
             return Collections.emptyList();
@@ -217,7 +217,7 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
         }
         if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社") || sysOrg.getType() == 9) {
             sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
-        } else if (sysOrg.getType() == 3) {
+        } else if (sysOrg.getType() == 3 || sysOrg.getType() == 4) {
             sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
         } else {
             return Collections.emptyList();

soc-modules/soc-modules-core/src/main/resources/mapper/question/QuestionMapper.xml

@@ -461,9 +461,10 @@
         q.confirm_status,
         q.reform_status,
         q.reform_deadline,
-        case q.src_type when 1 then '确认' else ( case f1.execute_status when 0 then '确认' when 1 then '提出异议' else
+        case  when q.src_type=1 then '自查无需确认' when q.src_type=2 and q.confirm_status=2 and f1.execute_status is null then '自查无需确认' else ( case f1.execute_status when 0 then '确认' when 1 then '提出异议' else
         '未确认'
         end) end as confirmStatusText,
+<!--        case q.confirm_status when 0 then '未确认' when 1 then '提出异议'  when 2 then '确认' when 3 then '确认' end as confirmStatusText,-->
         f1.executor_name as confirmorName,
         f1.description as confirmDesc,
         case f2.execute_status when 0 then '同意' when 1 then '不同意' else '' end as dissentStatusText,
@@ -522,7 +523,7 @@
         q.submit_time,
         q.confirm_status,
         q.reform_deadline,
-        case q.src_type when 1 then '确认' else ( case f1.execute_status when 0 then '确认' when 1 then '提出异议' else
+        case  when q.src_type=1 then '自查无需确认' when q.src_type=2 and q.confirm_status=2 and f1.execute_status is null then '自查无需确认' else ( case f1.execute_status when 0 then '确认' when 1 then '提出异议' else
         '未确认'
         end) end as confirmStatusText,
         f1.executor_name as confirmorName,