质量事故单

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/IncidentTicketChildrenServiceImpl.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.oa.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.oa.entity.IncidentTicketChildren;
+import org.jeecg.modules.oa.entity.SyCarryB;
+import org.jeecg.modules.oa.mapper.IncidentTicketChildrenMapper;
+import org.jeecg.modules.oa.mapper.SyCarryBMapper;
+import org.jeecg.modules.oa.service.IIncidentTicketChildrenService;
+import org.jeecg.modules.oa.service.ISyCarryBService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+public class IncidentTicketChildrenServiceImpl extends ServiceImpl<IncidentTicketChildrenMapper, IncidentTicketChildren> implements IIncidentTicketChildrenService {
+
+	@Autowired
+	private IncidentTicketChildrenMapper incidentTicketChildrenMapper;
+
+	public List<IncidentTicketChildren> selectByMainId(String mainId) {
+
+		return incidentTicketChildrenMapper.selectByMainId(mainId);
+	}
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/IncidentTicketServiceImpl.java

@@ -3,7 +3,6 @@ package org.jeecg.modules.oa.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.vo.LoginUser;
@@ -19,6 +18,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import java.io.Serializable;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Collection;
@@ -40,8 +40,7 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 	private ISysBaseAPI sysBaseAPI;
 	@Autowired
 	private IIncidentTicketMsgService iIncidentTicketMsgService;
-	@Autowired
-	private IIncidentTicketService iIncidentTicketService;
+
 
 	@Override
 	@Transactional
@@ -68,7 +67,10 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 			return "未找到对应数据";
 		}
 		incidentTicketEntity.setState("2");//1未处理 2已通知 3通知已反馈 4已推送 5已完结
-		iIncidentTicketService.save(incidentTicketEntity);
+//		incidentTicketEntity.setUpdateBy(sysUser.getUsername());
+//		incidentTicketEntity.setUpdateTime(new Date());
+//		incidentTicketMapper.updateById(incidentTicketEntity);
+		this.save(incidentTicketEntity);
 
 		return "已通知";
 	}
@@ -118,7 +120,10 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 				return "未找到对应数据";
 			}
 			incidentTicketEntity.setState("3");//1未处理 2已通知 3通知已反馈 4已推送 5已完结
-			iIncidentTicketService.save(incidentTicketEntity);
+//			incidentTicketEntity.setUpdateBy(sysUser.getUsername());
+//			incidentTicketEntity.setUpdateTime(new Date());
+//			incidentTicketMapper.updateById(incidentTicketEntity);
+			this.save(incidentTicketEntity);
 		}
 
 		return "已通知";

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -1453,7 +1453,9 @@ public class SysUserController {
         String ids = jsonObject.getString("ids");
         String gongJiJin = jsonObject.getString("gongJiJin");
         String sheBao = jsonObject.getString("sheBao");
-
+        if(StringUtils.isBlank(gongJiJin) && StringUtils.isBlank(sheBao)){
+            return Result.error("请至少填写一项");
+        }
         String[] idList = ids.split(",");
         if(idList.length > 0){
             for(String o:idList){