cnas-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodMapper.java
@@ -17,6 +17,8 @@ IPage<StandardMethod> selectStandardMethodList(Page page, QueryWrapper<StandardMethod> ew); StandardMethod selectStandMethodById(Integer id); }
@@ -49,7 +49,7 @@ private String name; @ValueTableShow(2) @ApiModelProperty(value = "标准描述(英文)") @ApiModelProperty(value = "标准描述EN") private String nameEn; /** cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
@@ -29,13 +29,29 @@ @ApiModelProperty(value = "检验项") private String inspectionItem; @ValueTableShow(2) @ApiModelProperty(value = "检验项EN") private String inspectionItemEn; // @ValueTableShow(2) // @ApiModelProperty(value = "检验子项") // @ApiModelProperty(value = "检验分类") // private String inspectionItemClassify; @ValueTableShow(3) @ApiModelProperty(value = "检验项子项") @ApiModelProperty(value = "检验子项") private String inspectionItemSubclass; @ValueTableShow(3) @ApiModelProperty(value = "检验子项EN") private String inspectionItemSubclassEn; @ValueTableShow(3) @ApiModelProperty(value = "检验对象") private Integer sample; @ValueTableShow(4) @ApiModelProperty(value = "单价(元)") private BigDecimal price; @ValueTableShow(4) @ApiModelProperty(value = "实验室") @@ -46,16 +62,20 @@ private String sonLaboratory; @ValueTableShow(5) @ApiModelProperty(value = "要求描述") private String askTell; @ValueTableShow(5) @ApiModelProperty(value = "要求值") private String ask; @ValueTableShow(5) @ApiModelProperty(value = "计量单位") private String unit; @ValueTableShow(5) @ValueTableShow(6) @ApiModelProperty(value = "试验方法") private String method; @ValueTableShow(6) @ApiModelProperty(value = "单价(元)") private BigDecimal price; @ValueTableShow(7) @ApiModelProperty(value = "工时(H)") @@ -77,7 +97,6 @@ @ApiModelProperty(value = "检验值类型") private String inspectionValueType; @ValueTableShow(10) @ApiModelProperty(value = "设备组") private String deviceGroup; @@ -95,10 +114,6 @@ @ValueTableShow(13) @ApiModelProperty(value = "特殊标识") private String bsm; @ValueTableShow(5) @ApiModelProperty(value = "检验对象") private Integer sample; @ValueTableShow(14) @ApiModelProperty(value = "原始记录模板") cnas-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodServiceImpl.java
@@ -66,7 +66,7 @@ @Override public int upStandardMethod(StandardMethod standardMethod) { int i = standardMethodMapper.updateById(standardMethod); standardTreeService.reTreeBySampleType(standardMethod.getSampleType()); standardTreeService.reTreeBySampleType(standardMethodMapper.selectStandMethodById(standardMethod.getId()).getSampleType()); return i; } } cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
@@ -41,4 +41,26 @@ ${ew.customSqlSegment} </if> </select> <select id="selectStandMethodById" resultType="com.yuanchu.mom.pojo.StandardMethod"> select sm.id, sm.code, sm.name, sm.structure_test_object_id, sto.specimen_name sample_type, sm.remark, u1.name create_user_name, sm.create_time, u2.name update_user_name, sm.update_time, sm.is_product, sm.field, sm.name_en, sm.is_use, sm.qualification_id from standard_method sm left join user u1 on sm.create_user = u1.id left join user u2 on sm.update_user = u2.id left join structure_test_object sto on sm.structure_test_object_id = sto.id where sm.id = #{id} </select> </mapper> inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductUser.java
@@ -7,7 +7,9 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; /** * 检验项目的人员检验记录 @@ -15,6 +17,8 @@ */ @TableName(value ="ins_product_user") @Data @AllArgsConstructor @NoArgsConstructor public class InsProductUser implements Serializable { /** * inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -91,6 +91,9 @@ @Resource private InsProductResultMapper insProductResultMapper; @Resource private InsProductUserMapper insProductUserMapper; @Override public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) { Map<String, Object> map = new HashMap<>(); @@ -144,7 +147,6 @@ public void saveInsContext(Map<String, Object> insContext) { Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId"); CompletableFuture.supplyAsync(() -> { AtomicInteger count = new AtomicInteger(); insContext.forEach((k, v) -> { JSONObject jo = JSON.parseObject(JSON.toJSONString(v)); InsProduct insProduct = new InsProduct(); @@ -168,7 +170,8 @@ map.put("u", insValue.get("u")); } iv.add(map); }catch (Exception e){} } catch (Exception e) { } } result.setInsValue(JSON.toJSONString(iv)); } @@ -206,11 +209,17 @@ } insProduct.setUpdateUser(userId); insProductMapper.updateById(insProduct); if (count.get() == 0) { insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId())); InsSample insSample = insSampleMapper.selectById(insProductMapper.selectById(insProduct.getId()).getInsSampleId()); insSample.setInsState(1); count.addAndGet(1); Long l = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery() .eq(InsProduct::getInsSampleId, insSample.getId())); Long l1 = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery() .eq(InsProduct::getInsSampleId, insSample.getId()).isNotNull(InsProduct::getInsResult)); if (l == l1) { insSample.setInsState(2); } insSampleMapper.updateById(insSample); }); return null; }).thenAccept(res -> { @@ -491,8 +500,8 @@ Map<String, Object> style = new HashMap<>(); style.put("rowlen", config.get("rowlen")); style.put("columnlen", config.get("columnlen")); // int r = -1; /*if (BeanUtil.isNotEmpty(cellData)) { /*int r = -1; if (BeanUtil.isNotEmpty(cellData)) { for (JSONObject o : cellData) { JSONObject v = JSON.parseObject(JSON.toJSONString(o.get("v"))); tableData.add(o); inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -51,12 +51,12 @@ io.state = 1 AND io.ins_state != 5 and send_time is not null and (isu.user_id = #{userId} OR isu.user_id is NULL) GROUP BY ip.son_laboratory, io.id ) a LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory where a.user_id = #{userId} OR a.user_id is NULL ORDER BY a.user_id DESC, a.type DESC, inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -103,6 +103,6 @@ select sm.code,sm.name,sm.remark from standard_method sm left join structure_test_object sto on sm.structure_test_object_id = sto.id where sto.specimen_name = #{sampleType} and is_product = 1 and is_use = 1 </select> </mapper>
