合并代码

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureDetailsController.java

@@ -5,10 +5,6 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.module.common.api.dto.FailureStatusCountDto;
-import com.yeejoin.amos.boot.module.common.biz.constats.Constants;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -26,11 +22,17 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureStatusCountDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
+import com.yeejoin.amos.boot.module.common.biz.constats.Constants;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FailureDetailsServiceImpl;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -61,15 +63,7 @@ public class FailureDetailsController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
 	public ResponseModel<Object> save(@RequestBody FailureDetailsDto model )  {
-	  	Object result;
-		try {
-			result = failureDetailsServiceImpl.savemodel(model,getSelectedOrgInfo());
-			 return ResponseHelper.buildResponse(result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			// TODO Auto-generated catch block
-			 return ResponseHelper.buildResponse("error");
-		}
+			 return ResponseHelper.buildResponse( failureDetailsServiceImpl.savemodel(model,getSelectedOrgInfo()));
 	}
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java

@@ -250,7 +250,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	 * @throws Exception
 	 */
 	@Transactional
-	public Object savemodel(FailureDetailsDto failureDetailsDto, ReginParams userInfo) throws Exception {
+	public Object savemodel(FailureDetailsDto failureDetailsDto, ReginParams userInfo)  {
 		String businessKey = buildOrderNo();
 		JSONObject body = new JSONObject();
 		body.put("businessKey", businessKey);
@@ -289,18 +289,6 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			Date processTime = model.getSubmissionTime();
 			repairlog(faultId, processAuditor, processTime, processDepartment, processResult);
 
-
-/*			FailureAuditDto failureAuditDto = new FailureAuditDto();
-			failureAuditDto.setAuditor(model.getRecUserName());
-			failureAuditDto.setFaultId(model.getSequenceNbr());
-			failureAuditDto.setAuditOpinion("已发起");
-			failureAuditDto.setAuditTime(new Date());
-			failureAuditDto.setIsDelete(true);
-			failureAuditDto.setAuditResult(5);
-
-			if (ObjectUtils.isNotEmpty(failureAuditDto)) {
-				failureAuditServiceImpl.savemodel(failureAuditDto, userInfo);
-			}*/
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.info("添加故障维修信息到数据库失败");
@@ -390,7 +378,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		map.put("checkFlag", false);
 		FailureDetailsDto failureDetailsDto = this.queryBySeq(sequenceNbr);
 		// 获取送达部门的ID
-		Integer failureEquipmentId = failureDetailsDto.getFailureEquipmentId();
+		Long failureEquipmentId = failureDetailsDto.getSubmissionBranchId();
 		// 获取上一级操作部门的Id
 		FailureDetails details = this.baseMapper.selectById(sequenceNbr);
 		String procressId = details.getProcessId();