add. 工时增加

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingAddServiceImpl.java

@@ -79,10 +79,6 @@ public class TBDingAddServiceImpl extends ServiceImpl<TBDingAddMapper, TBDingAdd
         String sopNo = dingAddParam.getSopNo();
         BigDecimal addDays = dingAddParam.getAddDays();
         BigDecimal addHours = dingAddParam.getAddHours();
-        if ((Objects.isNull(addDays) && Objects.isNull(addHours)) || (Objects.nonNull(addDays) && Objects.nonNull(
-                addHours))) {
-            throw ExceptionResultEnum.ERROR.exception("追加天数和追加小时数必填且只能选填一个");
-        }
 
         boolean isCoordinator = tbUserArchivesService.containsRegionCoordinator(userId);
         if (!isCoordinator && Objects.isNull(sopNo)) {

sop-business/src/main/resources/db/log/caozixuan_update_log.sql

@@ -26,31 +26,38 @@ ALTER TABLE t_b_ding_add
     ADD UNIQUE INDEX ding_add_unique (service_id ASC, user_id ASC);
 
 ALTER TABLE t_b_ding_statistic_by_crm
-    ADD COLUMN add_days DECIMAL(8,2) NULL COMMENT '增加人天（天1）' AFTER mark_paper_period,
+    ADD COLUMN add_days DECIMAL(8,2) NULL COMMENT '增加人天（天）' AFTER mark_paper_period,
     ADD COLUMN add_hours DECIMAL(8,2) NULL COMMENT '增加小时（小时）' AFTER add_days,
     ADD COLUMN work_days DECIMAL(8,2) NULL COMMENT '累计人天（天）' AFTER add_hours,
     CHANGE COLUMN work_hours work_hours DECIMAL(8,2) NULL COMMENT '累计工时（小时）' ;
 
 ALTER TABLE t_b_ding_statistic_by_custom
-    ADD COLUMN add_days DECIMAL(8,2) NULL COMMENT '增加人天（天1）' AFTER mark_paper_period,
+    ADD COLUMN add_days DECIMAL(8,2) NULL COMMENT '增加人天（天）' AFTER mark_paper_period,
     ADD COLUMN add_hours DECIMAL(8,2) NULL COMMENT '增加小时（小时）' AFTER add_days,
     ADD COLUMN work_days DECIMAL(8,2) NULL COMMENT '累计人天（天）' AFTER add_hours,
     CHANGE COLUMN work_hours work_hours DECIMAL(8,2) NULL COMMENT '累计工时（小时）' ;
 
 ALTER TABLE t_b_ding_statistic_by_person
-    ADD COLUMN add_days DECIMAL(8,2) NULL COMMENT '增加人天（天1）' AFTER legal_holidays,
+    ADD COLUMN add_days DECIMAL(8,2) NULL COMMENT '增加人天（天）' AFTER legal_holidays,
     ADD COLUMN add_hours DECIMAL(8,2) NULL COMMENT '增加小时（小时）' AFTER add_days,
     ADD COLUMN work_days DECIMAL(8,2) NULL COMMENT '累计人天（天）' AFTER add_hours,
     CHANGE COLUMN work_hours work_hours DECIMAL(8,2) NULL COMMENT '累计工时（小时）' ;
 
 ALTER TABLE t_b_ding_statistic_by_sop
-    ADD COLUMN add_days DECIMAL(8,2) NULL COMMENT '增加人天（天1）' AFTER legal_holidays,
+    ADD COLUMN add_days DECIMAL(8,2) NULL COMMENT '增加人天（天）' AFTER legal_holidays,
     ADD COLUMN add_hours DECIMAL(8,2) NULL COMMENT '增加小时（小时）' AFTER add_days,
     ADD COLUMN work_days DECIMAL(8,2) NULL COMMENT '累计人天（天）' AFTER add_hours,
     CHANGE COLUMN work_hours work_hours DECIMAL(8,2) NULL COMMENT '累计工时（小时）' ;
 
 ALTER TABLE t_b_ding_statistic_by_supplier
-    ADD COLUMN add_days DECIMAL(8,2) NULL COMMENT '增加人天（天1）' AFTER legal_holidays,
+    ADD COLUMN add_days DECIMAL(8,2) NULL COMMENT '增加人天（天）' AFTER legal_holidays,
     ADD COLUMN add_hours DECIMAL(8,2) NULL COMMENT '增加小时（小时）' AFTER add_days,
     ADD COLUMN work_days DECIMAL(8,2) NULL COMMENT '累计人天（天）' AFTER add_hours,
     CHANGE COLUMN work_hours work_hours DECIMAL(8,2) NULL COMMENT '累计工时（小时）' ;
+
+-- 2024-11-06
+INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, enable, default_auth, front_display) VALUES ('2110', '查询区协可选择的客户', '/api/admin/tb/ding/find_custom', 'URL', '26', '6', 'SYS', '1', '1', '0');
+INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, enable, default_auth, front_display) VALUES ('2120', '增加工时-查询可选sop', '/api/admin/tb/ding/add/find_sop_list', 'URL', '29', '3', 'AUTH', '1', '1', '0');
+INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, enable, default_auth, front_display) VALUES ('2121', '增加工时-提交', '/api/admin/tb/ding/add/submit', 'URL', '29', '4', 'AUTH', '1', '1', '0');
+INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES ('2122', '添加工时', 'AddDing', 'LINK', '29', '3', 'AUTH', '2120,2121', '1', '0', '1');
+