Browse Source

解决用章审批显示签名太大;2.详情页还能上传附件?3.审批意见靠左对齐,不居中问题,分管领导可选择多人审批

LuChongMei 10 months ago
parent
commit
7074453466

+ 8 - 3
jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/yzcirculation/controller/YzCirculationCardController.java

@@ -110,6 +110,8 @@ public class YzCirculationCardController {
 		for (YzCirculationCardDTO y :result.getRecords()){
 			UserDTO userDTO2=userService.get(y.getAuthorPerson());
 			y.setAuthorPerson(userDTO2.getName());
+			UserDTO userDTO1=userService.getUserByLoginName(y.getProofreader(),"10000");
+			y.setProofreader(userDTO1.getName());
 		}
 		return ResponseEntity.ok (result);
 	}
@@ -122,12 +124,15 @@ public class YzCirculationCardController {
 	@ApiOperation(value = "根据Id获取拟稿申请数据")
 //	@PreAuthorize("hasAnyAuthority('yzcirculation:yzCirculationCard:view','yzcirculation:yzCirculationCard:add','yzcirculation:yzCirculationCard:edit')")
 	@GetMapping("queryById")
-	public ResponseEntity<YzCirculationCardDTO> queryById(String id) {
+	public ResponseEntity<YzCirculationCardDTO> queryById(String id,Integer type) {
 		YzCirculationCardDTO yzCirculationCardDTO = yzCirculationCardWrapper.toDTO(yzCirculationCardService.getById ( id )) ;
 		UserDTO userDTO2=userService.get(yzCirculationCardDTO.getAuthorPerson());
+		yzCirculationCardDTO.setAuthorId(yzCirculationCardDTO.getAuthorPerson());
 		yzCirculationCardDTO.setAuthorPerson(userDTO2.getName());
-		UserDTO userDTO=userService.getUserByLoginName(yzCirculationCardDTO.getProofreader(),"10000");
-		yzCirculationCardDTO.setProofreader(userDTO.getName());
+		if(type!=null && type==1) {
+			UserDTO userDTO=userService.getUserByLoginName(yzCirculationCardDTO.getProofreader(),"10000");
+			yzCirculationCardDTO.setProofreader(userDTO.getName());
+		}
 		return ResponseEntity.ok (  yzCirculationCardDTO);
 	}
 

+ 1 - 1
jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/yzcirculation/service/dto/YzCirculationCardDTO.java

@@ -41,7 +41,7 @@ public class YzCirculationCardDTO extends BaseDTO {
     @Query(tableColumn = "a.author_person", javaField = "authorPerson", type = QueryType.EQ)
     @ExcelProperty(value = "拟稿人")
 	private String authorPerson;
-
+	private String authorId;
 	/**
      * 校对人
      */

+ 18 - 14
jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/yzflow/controller/YzFlowController.java

@@ -118,20 +118,24 @@ public class YzFlowController {
 			//有选择领导的时候新增
 			if(yzFlowDTO.getNeUser()!=null) {
 					if(!yzFlowDTO.getNeUser().equals("")){
-						YzFlowDTO a1=new YzFlowDTO();
-						a1.setYzId(yzFlowDTO.getYzId());
-						a1.setState("1");
-						UserDTO userDTO2=userService.getUserByLoginName(yzFlowDTO.getNeUser(),"10000");
-						a1.setCreateBy(userDTO);
-						a1.setUpdateBy(userDTO2);
-						a1.setCreateTruename(userDTO.getName());
-						a1.setNextTruename(userDTO2.getName());
-						a1.setNextUser(userDTO2.getId());
-						if(userDTO2.getRoleNames().contains("科室负责人")) a1.setWhich("0");
-						if(userDTO2.getRoleNames().contains("办公室主任") || userDTO2.getRoleNames().contains("办公室管理员") ) a1.setWhich("1");
-						if(userDTO2.getRoleNames().contains("分管领导")) a1.setWhich("2");
-						if(userDTO2.getRoleNames().contains("局领导")) a1.setWhich("3");
-						yzFlowService.saveOrUpdate (yzFlowWrapper.toEntity (a1));
+						String[] user = yzFlowDTO.getNeUser().split(",");
+						for (int i = 0; i < user.length; i++) {
+							YzFlowDTO a1=new YzFlowDTO();
+							a1.setYzId(yzFlowDTO.getYzId());
+							a1.setState("1");
+							UserDTO userDTO2=userService.getUserByLoginName(user[i],"10000");
+							a1.setCreateBy(userDTO);
+							a1.setUpdateBy(userDTO2);
+							a1.setCreateTruename(userDTO.getName());
+							a1.setNextTruename(userDTO2.getName());
+							a1.setNextUser(userDTO2.getId());
+							if(userDTO2.getRoleNames().contains("科室负责人")) a1.setWhich("0");
+							if(userDTO2.getRoleNames().contains("办公室主任") || userDTO2.getRoleNames().contains("办公室管理员") ) a1.setWhich("1");
+							if(userDTO2.getRoleNames().contains("分管领导")) a1.setWhich("2");
+							if(userDTO2.getRoleNames().contains("局领导")) a1.setWhich("3");
+							yzFlowService.saveOrUpdate (yzFlowWrapper.toEntity (a1));
+						}
+
 					}
 			}