inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductUserMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,18 @@ package com.yuanchu.mom.mapper; import com.yuanchu.mom.pojo.InsProductUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author z1292 * @description é对表ãins_product_user(æ£éªé¡¹ç®ç人åæ£éªè®°å½)ãçæ°æ®åºæä½Mapper * @createDate 2024-04-17 13:42:44 * @Entity com.yuanchu.mom.pojo.InsProductUser */ public interface InsProductUserMapper extends BaseMapper<InsProductUser> { }
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,37 @@ package com.yuanchu.mom.pojo; import com.baomidou.mybatisplus.annotation.*; import java.io.Serializable; import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * æ£éªé¡¹ç®ç人åæ£éªè®°å½ * @TableName ins_product_user */ @TableName(value ="ins_product_user") @Data public class InsProductUser implements Serializable { /** * */ @TableId(type = IdType.AUTO) private Integer id; @TableField(fill = FieldFill.INSERT) private Integer createUser; @ApiModelProperty("å建æ¶é´") @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** * å¤é®ï¼ins_product表id */ private Integer insProductId; } inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
@@ -185,4 +185,6 @@ @ApiModelProperty("1ï¼ææ 0ï¼æ æ") private Integer state; private String dic; } inspect-server/src/main/java/com/yuanchu/mom/service/InsProductUserService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,13 @@ package com.yuanchu.mom.service; import com.yuanchu.mom.pojo.InsProductUser; import com.baomidou.mybatisplus.extension.service.IService; /** * @author z1292 * @description é对表ãins_product_user(æ£éªé¡¹ç®ç人åæ£éªè®°å½)ãçæ°æ®åºæä½Service * @createDate 2024-04-17 13:42:44 */ public interface InsProductUserService extends IService<InsProductUser> { } inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -479,14 +479,15 @@ JSONObject sheet = JSON.parseObject(JSON.toJSONString(JSON.parseArray(JSON.toJSONString(JSON.parseObject(thing).get("data"))).get(0))); JSONObject config = JSON.parseObject(JSON.toJSONString(sheet.get("config"))); List<JSONObject> cellData = JSON.parseArray(JSON.toJSONString(sheet.get("celldata")), JSONObject.class); List<JSONObject> tableData = new ArrayList<>(); // List<JSONObject> tableData = new ArrayList<>(); 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)) { /*if (BeanUtil.isNotEmpty(cellData)) { for (JSONObject o : cellData) { JSONObject v = JSON.parseObject(JSON.toJSONString(o.get("v"))); tableData.add(o); if (BeanUtil.isNotEmpty(v.get("ps"))) { JSONObject ps = JSON.parseObject(JSON.toJSONString(v.get("ps"))); if (ps.get("value").equals("æ£éªé¡¹") && v.get("v").equals(product.getInspectionItem())) { @@ -504,8 +505,8 @@ } } } } product.setTemplate(tableData); }*/ product.setTemplate(cellData); product.setStyle(style); } } inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductUserServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,22 @@ package com.yuanchu.mom.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yuanchu.mom.pojo.InsProductUser; import com.yuanchu.mom.service.InsProductUserService; import com.yuanchu.mom.mapper.InsProductUserMapper; import org.springframework.stereotype.Service; /** * @author z1292 * @description é对表ãins_product_user(æ£éªé¡¹ç®ç人åæ£éªè®°å½)ãçæ°æ®åºæä½Serviceå®ç° * @createDate 2024-04-17 13:42:44 */ @Service public class InsProductUserServiceImpl extends ServiceImpl<InsProductUserMapper, InsProductUser> implements InsProductUserService{ }
@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -150,7 +151,7 @@ @Override @Transactional(rollbackFor = Exception.class) public void reTreeBySampleType(String sampleType) { // Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId"); Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId"); CompletableFuture.supplyAsync(() -> { List<StandardProductList> productList = standardTreeMapper.getStandardProductListBySample(sampleType); List<StandardProductList> productList1 = JSON.parseArray(JSON.toJSONString(productList), StandardProductList.class); @@ -173,9 +174,10 @@ int count2 = 0; for (StandardProductList pl2 : productList) { if (Objects.equals(pl1.getInspectionItemSubclass(), pl2.getInspectionItemSubclass()) && Objects.equals(pl1.getInspectionItem(), pl2.getInspectionItem())) { pl2.setUpdateUser(null); pl2.setUpdateTime(null); pl2.setUpdateUser(userId); pl2.setUpdateTime(LocalDateTime.now()); pl2.setId(pl1.getId()); pl2.setSample(tree.getSample()); standardProductListMapper.updateById(pl2); break; } else { inspect-server/src/main/resources/mapper/InsProductUserMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.yuanchu.mom.mapper.InsProductUserMapper"> <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsProductUser"> <id property="id" column="id" jdbcType="INTEGER"/> <result property="createUser" column="create_user" jdbcType="INTEGER"/> <result property="createTime" column="create_time" jdbcType="VARCHAR"/> <result property="insProductId" column="ins_product_id" jdbcType="INTEGER"/> </resultMap> <sql id="Base_Column_List"> id,create_user,create_time, ins_product_id </sql> </mapper> inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -93,7 +93,8 @@ man_day, sample, bsm, template_id template_id, dic from structure_item_parameter sp left join structure_test_object sto on sto.id = sp.sample where sto.specimen_name = #{sampleType}
