履职增加工作时间

project_data/sql/0.0.3/soc/soc.sql

@@ -981,6 +981,12 @@ INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_cla
 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', 'edu_training_type', null, 'default', 'N', '0',  null, now(), null, now(), null);
 
 
+-- 履职任务类型增加其它，履职时间增加工作时间
+update sys_dict_type set dict_name='履职任务类型' WHERE dict_type='resumption_plan_type';
+DELETE from sys_dict_data WHERE dict_type='resumption_plan_type' and dict_value=8;
+DELETE from sys_dict_data WHERE dict_type='resumption_plan_exec' and dict_value=6;
+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 (8, '其它', '8', 'resumption_plan_type', NULL, 'default', 'N', '0', '超级管理员', '2023-11-14 11:03:01', '', 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 (6, '工作时间', '6', 'resumption_plan_exec', NULL, 'default', 'N', '0', '超级管理员', '2023-11-14 11:43:43', '', NULL, NULL);
 
 
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/task/ResumptionTaskBusiness.java

@@ -408,6 +408,19 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
                     .setField(DateField.SECOND, 0)
                     .setField(DateField.MILLISECOND, 0);
             planendTime = DateUtil.endOfDay(time2).setField(DateField.MILLISECOND, 0);
+        }else if (appPlan.getPlanExec() == 6) {//工作时间
+            String workStart=workTime.getWorkTime();
+            String workEnd=workTime.getWorkOffTime();
+            if(StringUtils.isEmpty(workStart) || StringUtils.isEmpty(workEnd)){
+                log.error("作息" + workTime.getId() + "缺少上班开始或结束时间");
+                return new ArrayList<>();
+            }
+            planstartTime = time1.setField(DateField.HOUR_OF_DAY, Integer.parseInt(workStart.split(":")[0]))
+                    .setField(DateField.MINUTE, Integer.parseInt(workStart.split(":")[1]))
+                    .setField(DateField.SECOND, 0).setField(DateField.MILLISECOND, 0);
+            planendTime = time2.setField(DateField.HOUR_OF_DAY, Integer.parseInt(workEnd.split(":")[0]))
+                    .setField(DateField.MINUTE, Integer.parseInt(workEnd.split(":")[1]))
+                    .setField(DateField.SECOND, 0).setField(DateField.MILLISECOND, 0);
         }
 
         return buildResumptions(appPlan, execOrg, planstartTime, planendTime, new ArrayList<>(), workTimes);