6、导出委托单 检测项下标问题 客户权限放开 ok

7、 处理项添加编辑接口需要判断处理人不能为空 ok

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java

@@ -620,13 +620,13 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
         if (loginUser == null) {
             return BaseResponse.errorMsg("请登录账号");
         }
-        List<Integer> approvalIdList = sysApprovalMapper.getApprovalId("委托评审");
+        /*List<Integer> approvalIdList = sysApprovalMapper.getApprovalId("委托评审");
         if (approvalIdList == null) {
             return BaseResponse.errorMsg("委托评审信息错误");
         }
         if (!approvalIdList.contains(loginUser.getId())) {
             return BaseResponse.errorMsg("权限不足");
-        }
+        }*/
         if (id == null) {
             return BaseResponse.errorMsg("参数错误");
         }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/HandleServiceImpl.java

@@ -79,6 +79,9 @@ public class HandleServiceImpl extends ServiceImpl<HandleMapper, Handle> impleme
 		if (StringUtils.isEmpty(query.getName())) {
 			return BaseResponse.errorMsg("处理项名称不能为空!");
 		}
+		if (query.getUserId() == null) {
+			return BaseResponse.errorMsg("请选择处理人");
+		}
 		QueryWrapper<Handle> qw = new QueryWrapper<>();
 		qw.eq("name", query.getName());
 		int count = handleMapper.selectCount(qw);
@@ -102,6 +105,9 @@ public class HandleServiceImpl extends ServiceImpl<HandleMapper, Handle> impleme
 		if (StringUtils.isEmpty(query.getName())) {
 			return BaseResponse.errorMsg("处理项名称不能为空!");
 		}
+		if (query.getUserId() == null) {
+			return BaseResponse.errorMsg("请选择处理人");
+		}
 		Handle handle = handleMapper.selectById(query.getId());
 		if(handle == null){
 			return BaseResponse.errorMsg("信息错误!");

cement-business/src/main/java/cn/wise/sc/cement/business/util/WordUtil.java

@@ -5,6 +5,7 @@ import cn.wise.sc.cement.business.model.vo.SampleVo;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.xwpf.usermodel.XWPFRun;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
@@ -69,11 +70,26 @@ public class WordUtil {
 			List<SampleVo> list = (List<SampleVo>)beanParams.get("list");
 			if(list != null && list.size()>0){
 				for(SampleVo sampleVo : list){
-					if(sampleVo.getTeamName().contains("<sub>") || sampleVo.getTeamName().contains("</sub>") ){
-                        String teamName = sampleVo.getTeamName().replaceAll("<sub>","")
-                                .replaceAll("</sub>","");
-						sampleVo.setTeamName(teamName);
+					String teamName = sampleVo.getTeamName();
+					if(sampleVo.getTeamName().contains("<sub>") || sampleVo.getTeamName().contains("</sub>")
+							){
+						String startStr = "</w:t></w:r><w:r><w:rPr><w:vertAlign w:val='subscript'/></w:rPr><w:t>";
+						String endStr = "</w:t></w:r><w:r><w:t>";
+                        teamName = teamName
+		                        .replaceAll("<sub>",startStr)
+                                .replaceAll("</sub>",endStr);
+
                     }
+					if(sampleVo.getTeamName().contains("<sup>") || sampleVo.getTeamName().contains("</sup>")
+							){
+						String startStr = "</w:t></w:r><w:r><w:rPr><w:vertAlign w:val='superscript'/></w:rPr><w:t>";
+						String endStr = "</w:t></w:r><w:r><w:t>";
+						teamName = teamName
+								.replaceAll("<sup>",startStr)
+								.replaceAll("</sup>",endStr);
+
+					}
+					sampleVo.setTeamName(teamName);
 				}
 			}
 			template.process(beanParams, out);
@@ -91,7 +107,6 @@ public class WordUtil {
 			ServletOutputStream outputStream = response.getOutputStream();
 			response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
 			response.setContentType("application/octet-stream");
-			response.setHeader("fileName",templeName+ fileExt.getName() );
 			templeName = new String((templeName).getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1);
 			response.setHeader("Content-Disposition", "attachment;filename=" + templeName + fileExt.getName());
 			outputStream.write(buffer);

cement-business/target/maven-archiver/pom.properties

-#Created by Apache Maven 3.6.1
+#Created by Apache Maven 3.6.0
 version=1.0-SNAPSHOT
 groupId=cn.wise.sc.tjcement
 artifactId=cement-business

cement-common/common-swagger/target/maven-archiver/pom.properties

-#Created by Apache Maven 3.6.1
+#Created by Apache Maven 3.6.0
 version=1.0-SNAPSHOT
 groupId=cn.wise.sc.tjcement
 artifactId=common-swagger

cement-common/common-swagger/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

-D:\JavaProject\tianjin-cement\cement-common\common-swagger\src\main\java\cn\wise\sc\cement\common\swagger\SwaggerConfig.java
-D:\JavaProject\tianjin-cement\cement-common\common-swagger\src\main\java\cn\wise\sc\cement\common\swagger\PackageInfo.java
+D:\idea_workspases\tianjin-cement\cement-common\common-swagger\src\main\java\cn\wise\sc\cement\common\swagger\PackageInfo.java
+D:\idea_workspases\tianjin-cement\cement-common\common-swagger\src\main\java\cn\wise\sc\cement\common\swagger\SwaggerConfig.java

mybatis-generator/target/maven-archiver/pom.properties

-#Created by Apache Maven 3.6.1
+#Created by Apache Maven 3.6.0
 version=1.0-SNAPSHOT
 groupId=cn.wise.sc.tjcement
 artifactId=mybatis-generator

mybatis-generator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

-D:\JavaProject\tianjin-cement\mybatis-generator\src\main\java\cn\wise\sc\cement\mg\GeneratorApplication.java
+D:\idea_workspases\tianjin-cement\mybatis-generator\src\main\java\cn\wise\sc\cement\mg\GeneratorApplication.java