Merge pull request 'feature/cl' (#283) from feature/cl into develop

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/283

src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java

@@ -81,7 +81,7 @@ public class FunctionOutStaffServiceImpl {
             OrganizationAssert.isFalse(staffPO.getFreezeNum() == 0, SystemEnv.getHtmlLabelName(547949,user.getLanguage()));
         }
 
-        List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum(),staffPO.getPermanentNum());
+        List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
         //1.增加冻结数 （num为负数时为减少冻结数）
         Integer sum = numberF.stream()
                 .mapToInt(Integer::intValue)
@@ -233,7 +233,6 @@ public class FunctionOutStaffServiceImpl {
         bb.writeLog("编制参数"+ JSON.toJSONString(param));
         bb.writeLog("查询结果"+ JSON.toJSONString(staffPO));
         bb.writeLog("user对象"+JSON.toJSONString(user));
-        bb.writeLog("msg"+SystemEnv.getHtmlLabelName(547474,user.getLanguage()));
         OrganizationAssert.notEmpty(staffPO,SystemEnv.getHtmlLabelName(547474,user.getLanguage()));
         return staffPO.get(0);
     }

src/com/engine/organization/web/StaffOutController.java

@@ -36,6 +36,11 @@ public class StaffOutController {
     public ReturnResult changeStaff(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffOutParam staffOutParam) {
         try {
             User user = HrmUserVarify.getUser(request, response);
+            //ESB接口user对象是null
+            if (user == null) {
+                user = new User();
+                user.setUid(1);
+            }
             return ReturnResult.successed(user,staffOutService(user).changeStaff(staffOutParam));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
@@ -48,6 +53,11 @@ public class StaffOutController {
     public ReturnResult transactionOnJob(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffOutParam staffOutParam) {
         try {
             User user = HrmUserVarify.getUser(request, response);
+            //ESB接口user对象是null
+            if (user == null) {
+                user = new User();
+                user.setUid(1);
+            }
             return ReturnResult.successed(user,staffOutService(user).transactionOnJob(staffOutParam));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);

src/weaver/interfaces/organization/cronjob/DeleteIsCancelJobCrob.java

@@ -0,0 +1,65 @@
+package weaver.interfaces.organization.cronjob;
+
+import com.engine.organization.entity.job.po.JobPO;
+import com.engine.organization.mapper.job.JobMapper;
+import com.engine.organization.util.db.MapperProxyFactory;
+import org.apache.commons.collections.CollectionUtils;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author liang.cheng
+ * @Date 2024/10/18 11:25 AM
+ * @Description: 自动清除已失效的岗位 （执行前请注意编制的引用，会出现名称为空）
+ * @Version 1.0
+ */
+public class DeleteIsCancelJobCrob extends BaseCronJob {
+
+    @Override
+    public void execute() {
+
+        RecordSet rs = new RecordSet();
+
+        List<JobPO> jobList = new ArrayList<>();
+        rs.executeQuery("select id,ec_jobtitle,ec_department from jcl_org_job where delete_type = 0");
+        while (rs.next()) {
+            jobList.add(JobPO.builder()
+                    .id((long)Util.getIntValue(rs.getString("id")))
+                    .ecJobTitle(Util.getIntValue(rs.getString("ec_jobtitle")))
+                    .ecDepartment(Util.getIntValue(rs.getString("ec_department")))
+                    .build());
+        }
+
+
+
+        List<Long> deleteIds = new ArrayList<>();
+
+        jobList.forEach(job -> {
+
+            //1.岗位是否封存或删除
+            rs.executeQuery("select id from hrmjobtitles where id = ? and (canceled is null or canceled != 1)",job.getEcJobTitle());
+            if (!rs.next()) {
+                deleteIds.add(job.getId());
+                return;
+            }
+
+            //2.部门是否封存或删除
+            rs.executeQuery("select id from hrmdepartment where id = ? and (canceled is null or canceled != 1)",job.getEcDepartment());
+            if (!rs.next()) {
+                deleteIds.add(job.getId());
+            }
+
+        });
+
+        if (CollectionUtils.isNotEmpty(deleteIds)) {
+            MapperProxyFactory.getProxy(JobMapper.class).deleteByIds(deleteIds);
+        }
+
+
+
+    }
+}

src/weaver/interfaces/organization/cronjob/TableDeleteDataCron.java

@@ -0,0 +1,34 @@
+package weaver.interfaces.organization.cronjob;
+
+import weaver.conn.RecordSet;
+import weaver.interfaces.schedule.BaseCronJob;
+
+/**
+ * @Author liang.cheng
+ * @Date 2024/10/10 1:56 PM
+ * @Description: 定时清除组织管理Delete_type=1的数据
+ * @Version 1.0
+ */
+public class TableDeleteDataCron extends BaseCronJob {
+
+    @Override
+    public void execute() {
+        RecordSet rs = new RecordSet();
+
+        rs.execute("delete from jcl_org_scheme where delete_type = 1");
+        rs.execute("delete from jcl_org_level where delete_type = 1");
+        rs.execute("delete from jcl_org_grade where delete_type = 1");
+        rs.execute("delete from jcl_org_sequence where delete_type = 1");
+        rs.execute("delete from jcl_org_staffplan where delete_type = 1");
+        rs.execute("delete from jcl_org_staff where delete_type = 1");
+        rs.execute("delete from jcl_org_job where delete_type = 1");
+        rs.execute("delete from jcl_org_jobext where delete_type = 1");
+        rs.execute("delete from jcl_org_jobext_dt1 where delete_type = 1");
+        rs.execute("delete from jcl_org_detach where delete_type = 1");
+        rs.execute("delete from jcl_org_cardaccess where delete_type = 1");
+        rs.execute("delete from jcl_org_cardbutton where delete_type = 1");
+        rs.execute("delete from jcl_field_extendgroup where delete_type = 1");
+        rs.execute("delete from jcl_field_extendtitle where delete_type = 1");
+        rs.execute("delete from jcl_field_extendinfo where delete_type = 1");
+    }
+}