设备之系统——消息提醒 V2.2

修复BUG 定时任务修改

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/MaintenanceServiceImpl.java

@@ -438,12 +438,13 @@ public class MaintenanceServiceImpl implements MaintenanceService {
             EquMaintenanceScheduleDo maintenanceSchedule,
             Integer month){
         Date newDate = new Date();
-        SysUserVo currentUser = CommonUtils.getCurrentUser();
+        // SysUserVo currentUser = CommonUtils.getCurrentUser();
         List<EquMaintenanceTaskDo> maintenanceTaskList = new ArrayList<>();
         for (EquMaintenancePartDo maintenancePart : maintenancePartList) {
             SysSerialVo sysSerialVo = new SysSerialVo();
-            String plantSimp = PlantEnum.addrOf(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1]);
-            sysSerialVo.setModulecode("equ_maintenance_task_aq_code_"+plantSimp);
+            // String plantSimp = PlantEnum.addrOf(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1]);
+            String plantSimp = PlantEnum.addrOf(maintenancePart.getTenantid());
+            sysSerialVo.setModulecode("equ_maintenance_task_aq_code_"+ plantSimp);
             sysSerialVo.setResetrule("date:yyyy");
             sysSerialVo.setIfautomaticreset("y");
             sysSerialVo.setRuleTemplateStr(plantSimp +"-"+maintenanceSchedule.getPlantype()+"-@{date:yyyyMM}-@{serialNumber:#00000}");
@@ -453,14 +454,10 @@ public class MaintenanceServiceImpl implements MaintenanceService {
             BeanUtils.copyProperties( maintenancePart,equMaintenanceTask);
             equMaintenanceTask.setId(SecurityUtil.getUUID())
                     .setMonth(month.toString())
-                    .setCreateuserid(currentUser.getId())
                     .setEquipmentnumber(maintenanceSchedule.getEquipmentnumber())
-                    .setCreateusername(currentUser.getName())
                     .setCreatedate(newDate)
-                    .setModifyuserid(currentUser.getId())
-                    .setModifyusername(currentUser.getName())
                     .setModifydate(newDate)
-                    .setTenantid(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1]);
+                    .setTenantid(maintenancePart.getTenantid());
             if ("200".equals(serialNumberCode.getCode())){
 
                 Object data = serialNumberCode.getData();