正式版本部署节点

cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java

@@ -711,11 +711,11 @@ public class EntrustController {
 				.stream()
 				.filter(arg -> arg.getCementCode().equals(arg.getParallelCode()) )
 				.forEach(arg -> {
-					List<SampleTeamGroupVo> teamVoList = arg.getSampleTeamGroupVoList();
+					/*List<SampleTeamGroupVo> teamVoList = arg.getSampleTeamGroupVoList();
 					teamVoList.forEach(args ->{
 						List<SampleDistributionTeamVo> teamVoList2 = args.getSampleDistributionTeamVoList();
 						arg.setTeamName(getTeamName(teamVoList2));
-					});
+					});*/
 					sampleList.add(arg);
 				});
 		beanParams.put("list", sampleList);

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml

@@ -372,8 +372,10 @@
         ELSE ''
         END
         ) as statusValue,
-        t.remark as returnReason
+        t.remark as returnReason,
+        h.id as objId, h.name as objName
         from sample_handle t
+        left join handle h on h.id = t.handle_id
         left join sys_user su on su.id = t.user_id
         left join sample s on s.id = t.sample_id
         left join entrust e on e.id = s.entrust_id
@@ -419,8 +421,10 @@
         ELSE ''
         END
         ) as statusValue,
-        t.remark as returnReason
+        t.remark as returnReason,
+        te.id as objId, te.name as objName
         from sample_distribution t
+        left join team te on te.id = t.team_id
         left join sys_user su on su.id = t.user_id
         left join sample s on s.id = t.sample_id
         left join entrust e on e.id = s.entrust_id

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleReturnHandleVo.java

@@ -19,6 +19,12 @@ public class SampleReturnHandleVo {
 	@ApiModelProperty("样品处理表id/样品检测表id")
 	private Integer id;
 
+	@ApiModelProperty("处理项id/检测项id")
+	private Integer objId;
+
+	@ApiModelProperty("处理项名称/检测项名称")
+	private String objName;
+
 	@ApiModelProperty("委托表id")
 	private String entrustId;
 

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

@@ -91,12 +91,8 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
     ISampleDistributionService iSampleDistributionService;
     @Resource
     PrecipriceMapper precipriceMapper;
-    @Resource
-    private SampleMapper sampleMapper;
-    @Resource
-    private EntrustMapper entrustMapper;
-    @Resource
-    private ProjectMapper projectMapper;
+    @Autowired
+    private ISysUserService userService;
 
 
     public PrecipriceServiceImpl(EntrustMapper iEntrustService,
@@ -226,9 +222,18 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
 
     @Override
     public BaseResponse<List<NormProductionStatistics>> normProductionStatistics(Long start, Long end, String name, Integer groupId) {
+        LoginUser loginUser = userService.getLoginUser();
+        if (loginUser == null) {
+            return BaseResponse.errorMsg("请登录账号");
+        }
+        //只有管理员角色的用户可以查看所有人的产值，其他人只能查看自己的产值
+        Integer userobjId = null;
+        if(loginUser.getRoleList().getId() != 1){
+            userobjId = loginUser.getId();
+        }
         //统计分样处理的详情
         List<NormProduction.NormProductionDetail> normProductionDetails =
-                normProductionDetails(null, start, end);
+                normProductionDetails(userobjId, start, end);
 
         if (normProductionDetails.size() == 0) {
             BaseResponse<List<NormProductionStatistics>> rts = BaseResponse.okData(null);
@@ -324,7 +329,7 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
             qw.le("create_time", endTime);
         }
         if (!BeanUtil.isEmpty(userId)) {
-            qw.like("user_id", userId);
+            qw.eq("user_id", userId);
         }
         qw.eq("status", 1);
         qw.orderByDesc("create_time");

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

@@ -205,6 +205,10 @@ public class ExcelUtil {
                         cell = row.createCell(i);
                         if (value != null) {
                             //处理下标
+                            if (value.contains("<sup>") || value.contains("</sup>")) {
+                                value = value.replaceAll("<sup>-</sup>", "⁻");
+                            }
+
                             if (value.contains("<sub>") || value.contains("</sub>")) {
                                 xxsfFont.setTypeOffset(FontFormatting.SS_SUB);
                                 cell.setCellStyle(style);
@@ -212,18 +216,23 @@ public class ExcelUtil {
                                 //提取下标位置
                                 applyRichStringFontsub(value, richString, xxsfFont);
                                 cell.setCellValue(richString);
-                            } else if (value.contains("<sup>") || value.contains("</sup>")) {
+//                                value = cell.getStringCellValue();
+                            }else{
+                                cell.setCellValue(value);
+                                cell.setCellStyle(style);
+                            }
+                            /*if (value.contains("<sup>") || value.contains("</sup>")) {
                                 xxsfFont.setTypeOffset(FontFormatting.SS_SUPER);
                                 cell.setCellStyle(style);
                                 XSSFRichTextString richString = new XSSFRichTextString(value.replaceAll("</sup>", "<sup>").replaceAll("<sup>", ""));
                                 //提取下标位置
                                 applyRichStringFontsup(value, richString, xxsfFont);
                                 cell.setCellValue(richString);
-                            } else {
-                                cell.setCellValue(value);
+                                value = cell.getStringCellValue();
+                            }*/
+
+
 
-                                cell.setCellStyle(style);
-                            }
                         }
                     }
                 }

cement-business/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
   profiles:
     active: dev
   datasource:
-    # 192.168.110.85   admin!@#123    sinoma_zhengshiData
+    # 192.168.110.85   admin!@#123    sinoma_zhengshiData   sinoma_tmp
 #    url: jdbc:mysql://192.168.110.85:3306/sinoma_zhengshiData?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
 #    url: jdbc:mysql://192.168.110.85:3306/sinoma_bangye?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
     url: jdbc:mysql://47.93.148.213:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false