fix(企标稽查计划): 79316

laws-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java

@@ -24,6 +24,8 @@ import java.util.List;
  */
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
+	SysUser findUserByCalcNameWorkNo(@Param("inspectUser") String inspectUser);
+
 	/**
 	 * 分页查询用户，可支持组织机构检索
 	 * @return

laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml

@@ -228,4 +228,8 @@
 		</foreach>
 		)
     </select>
+
+    <select id="findUserByCalcNameWorkNo" resultType="com.jero.modules.system.entity.SysUser">
+		select * from sys_user where concat(realname, '（', username, '）') = #{inspectUser}
+	</select>
 </mapper>

laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java

@@ -346,4 +346,11 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @return
 	 */
 	String dictByIdsOrUserNames(String ids, String userNames);
+
+	/**
+	 * 通过 用户名（工号）查询用户
+	 * @param inspectUser
+	 * @return
+	 */
+	SysUser findUserByCalcNameWorkNo(String inspectUser);
 }

laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java

@@ -690,6 +690,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		}
 	}
 
+	@Override
+	public SysUser findUserByCalcNameWorkNo(String inspectUser) {
+		return userMapper.findUserByCalcNameWorkNo(inspectUser);
+	}
+
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java

@@ -166,6 +166,15 @@ public class ProcessEsInspectPlanController extends JeroController<ProcessEsInsp
         return super.exportXls(request, processEsInspectPlan, ProcessEsInspectPlan.class, "企标稽查计划业务表");
     }
 
+	 /**
+	  * 下载导入模板
+	  *
+	  */
+	 @GetMapping(value = "/templateDownload")
+	 public ModelAndView templateDownload() {
+		 return processEsInspectPlanService.templateDownload();
+	 }
+
     /**
       * 通过excel导入数据
     *

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/entity/ProcessEsInspectPlan.java

@@ -37,7 +37,7 @@ public class ProcessEsInspectPlan extends BaseEntity {
     @ApiModelProperty(value = "稽查依据标准号")
     private String inspectNo;
 	/**稽查依据标准名称*/
-	@Excel(name = "稽查依据标准名称", width = 15)
+	@Excel(name = "稽查依据标准名称", width = 16)
     @ApiModelProperty(value = "稽查依据标准名称")
     private String inspectName;
 	/**计划稽查对象*/
@@ -46,7 +46,7 @@ public class ProcessEsInspectPlan extends BaseEntity {
     @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
     private String inspectObject;
 	/**主责标准化工作组*/
-	@Excel(name = "主责标准化工作组", width = 15)
+	@Excel(name = "主责标准化工作组", width = 16)
     @ApiModelProperty(value = "主责标准化工作组")
     private String standardizationWorkGroup;
     /**所属部门*/

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.common.api.vo.Result;
 import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlan;
+import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -94,4 +95,10 @@ public interface IProcessEsInspectPlanService extends IService<ProcessEsInspectP
 	 * @return
 	 */
 	Result<ProcessEsInspectPlan> importExcel(HttpServletRequest request, HttpServletResponse response) throws Exception;
+
+	/**
+	 * 下载导入模板
+	 * @return
+	 */
+    ModelAndView templateDownload();
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java

@@ -387,7 +387,7 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService {
     }
 
     private static void saveCountersign(EsInspectPlanFlowVO esInspectPlanFlowVO, Map<String, Object> map, Task task) {
-        if (EsInspectPlanCommon.PROCESS_NODE_3.equals(task.getTaskDefinitionKey()) && map.containsKey("pass") && (boolean) map.get("pass")){
+        if (map.containsKey("pass") && (boolean) map.get("pass")){
             if (StringUtils.isNotBlank(esInspectPlanFlowVO.getCountersign())){
                 map.put(COUNTERSIGN, esInspectPlanFlowVO.getCountersign());
             }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java

@@ -24,14 +24,20 @@ import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysDepartService;
 import com.jero.modules.system.service.ISysUserService;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -237,7 +243,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 				firstVerify.addAll(sixthVerify);
 
 				if (!firstVerify.isEmpty()){
-					errorMSG.append(head).append(String.join(",", fifthVerify));
+					errorMSG.append(head).append(String.join(",", firstVerify));
 				}
 			}
 			//update-begin-author:taoyan date:20190528 for:批量插入数据
@@ -252,10 +258,26 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 		return Result.error("文件导入失败！");
 	}
 
+	@Override
+	public ModelAndView templateDownload() {
+		// AutoPoi 导出Excel
+		ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+		String title = "企标稽查计划导入模板";
+		//此处设置的filename无效 ,前端会重更新设置一下
+		mv.addObject("fileName", title);
+		mv.addObject("entity", ProcessEsInspectPlan.class);
+		ExportParams exportParams = new ExportParams(null, title);
+		// 导出xlsx
+		exportParams.setType(ExcelType.HSSF);
+		mv.addObject("params", exportParams);
+		mv.addObject(NormalExcelConstants.DATA_LIST, new ArrayList<T>());
+		return mv;
+	}
+
 	private List<String> sixthVerify(ProcessEsInspectPlan processEsInspectPlan) {
 		List<String> errorList = new ArrayList<>();
 		if (StringUtils.isNotBlank(processEsInspectPlan.getStandardizationDockingUser())){
-			SysUser sysUser = sysUserService.getUserByName(processEsInspectPlan.getStandardizationDockingUser());
+			SysUser sysUser = sysUserService.findUserByCalcNameWorkNo(processEsInspectPlan.getStandardizationDockingUser());
 			if (Objects.isNull(sysUser)){
 				errorList.add("标准化组对接人不存在!");
 			}else {
@@ -265,7 +287,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 			errorList.add("标准化组对接人不能为空!");
 		}
 		if (StringUtils.isNotBlank(processEsInspectPlan.getObjectOfConsultation())){
-			SysUser sysUser = sysUserService.getUserByName(processEsInspectPlan.getObjectOfConsultation());
+			SysUser sysUser = sysUserService.findUserByCalcNameWorkNo(processEsInspectPlan.getObjectOfConsultation());
 			if (Objects.isNull(sysUser)){
 				errorList.add("征求意见对象不存在!");
 			}else {
@@ -290,7 +312,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 			errorList.add("计划稽查日期不能为空!");
 		}
 		if (StringUtils.isNotBlank(processEsInspectPlan.getInspectUser())){
-			SysUser sysUser = sysUserService.getUserByName(processEsInspectPlan.getInspectUser());
+			SysUser sysUser = sysUserService.findUserByCalcNameWorkNo(processEsInspectPlan.getInspectUser());
 			if (Objects.isNull(sysUser)){
 				errorList.add("稽查负责人不存在!");
 			}else {