各bug修复

value

2024-05-10 0d6aae2036feb77bb2796f6b484489d7ffcd99c2

各bug修复

 framework/src/main/java/com/yuanchu/mom/pojo/IfsApi.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
package com.yuanchu.mom.pojo;

import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

import java.io.Serializable;

@Data
@Slf4j
@Component
public class IfsApi implements Serializable {
    /*测试库ip*/
//    final String ip = "http://192.168.20.47:8008";
//    final String ip2 = "http://192.168.20.47";
//    final String ip3 = "http://192.168.20.47:8081";
//
//    final String contractKey = "x%2bvbGReagnsK%2fDr45xkVcGLOh%2fWWGODQ2inBGeNwbZw%3d";
//    final String contractKeyPost = "x%2bvbGReagnsK%2fDr45xkVcGLOh%2fWWGODQ2inBGeNwbZw=";

    /*正式库ip*/
    final String ip = "http://192.168.20.50:8008";
    final String ip2 = "http://192.168.20.50";
    final String ip3 = "http://192.168.20.50:8081";

    final String contractKey = "x%2bvbGReagnsK%2fDr45xkVcGLOh%2fWWGODQ2inBGeNwbZw%3d";
    final String contractKeyPost = "x%2bvbGReagnsK%2fDr45xkVcGLOh%2fWWGODQ2inBGeNwbZw=";

    final String contract = "ZTZB";

    final String userId = "MESUser";
    //零件
    final String PART = ip + "/PurchService.ashx?contract=" + contract + "&contractKey=" + contractKey + "&procedureName=QUERY_INVENTORY_PART_INFO_STD&userId=" + userId + "&inAttr=%7B%0D%0A%20%20%20%20%22MODIFY_DATE%22:%22%22%0D%0A%7D";

}

 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java

@@ -196,7 +196,7 @@

    @ValueTableShow(value = 16, name = "来样方式")
    private String formType;
    @TableField(exist = false)

    @ApiModelProperty("审核时间")
    private LocalDateTime examineTime;


 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java

@@ -142,6 +142,9 @@
     */
    private String ask;

    /**要求描述*/
    private String tell;

    /**
     * æœ€ç»ˆå€¼
     */

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java

@@ -255,9 +255,7 @@
                // é€šè¿‡è®¢å•id查找所有样本id
                List<Integer> sampleIds = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId)).stream().map(InsSample::getId).collect(Collectors.toList());
                // é€šè¿‡æ£€æŸ¥æ¯ä¸€ä¸ªæ ·æœ¬id查到属于检验项结论 is null的数量
                Long count = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, sampleIds).isNull(InsProduct::getInsResult).eq(InsProduct::getSonLaboratory, insProduct.getSonLaboratory()));
                // is null的数量为0是将订单状态表的状态改为已检验
                List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, sampleIds).isNull(InsProduct::getInsResult).eq(InsProduct::getSonLaboratory, insProduct.getSonLaboratory()));
                Long count = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, sampleIds).isNull(InsProduct::getInsResult).eq(InsProduct::getSonLaboratory, insProduct.getSonLaboratory()).eq(InsProduct::getState, 1));
                if (count == 0) {
                    insOrderStateMapper.update(new InsOrderState(), Wrappers.<InsOrderState>lambdaUpdate()
                            .eq(InsOrderState::getInsOrderId, orderId)
@@ -563,7 +561,7 @@
                table.put("tableSize", tables.size() + 1);
            });
            List<Map<String, String>> deviceList = null;
            if(deviceSet.size()!=0){
            if (deviceSet.size() != 0) {
                deviceList = insOrderMapper.selectDeviceList(deviceSet);
            }
            Map<String, String> codeStr = new HashMap<>();
@@ -630,7 +628,7 @@
                FileInputStream stream = new FileInputStream(path);
                XWPFDocument document = new XWPFDocument(stream);
                List<XWPFTable> xwpfTables = document.getTables();
                for (int i = 1; i < xwpfTables.size() - (deviceList==null?1:2); i++) {
                for (int i = 1; i < xwpfTables.size() - (deviceList == null ? 1 : 2); i++) {
                    Set<String> set1 = new HashSet<>();
                    Map<String, Map<String, Integer>> maps = new HashMap<>();
                    for (int j = 0; j < xwpfTables.get(i).getRows().size(); j++) {
@@ -660,7 +658,7 @@
                            }
                        }
                    }
                    maps.forEach((k,v)->{
                    maps.forEach((k, v) -> {
                    });
                    List<String> list = new ArrayList<>();
                    for (String s : maps.keySet()) {
@@ -671,7 +669,7 @@
                        for (int j = 0; j < v.get("er") - v.get("sr") + 1; j++) {
                            TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
                        }
                        if(v.get("er")>v.get("sr")){
                        if (v.get("er") > v.get("sr")) {
                            TableTools.mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
                        }
                    }
@@ -720,7 +718,7 @@
        if (insProducts.size() > 0) {
            String str = "";
            for (InsProduct product : insProducts) {
                str += product.getInspectionItem() + product.getInspectionItemSubclass() + "；";
                str += product.getInspectionItem() + " " + product.getInspectionItemSubclass() + "；";
            }
            throw new ErrorException("以下是未检验的项目：" + str);
        }

 inspect-server/src/main/resources/mapper/InsSampleMapper.xml

@@ -16,7 +16,6 @@
        <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
        <result property="sample" column="sample" jdbcType="VARCHAR"/>
        <result property="model" column="model" jdbcType="VARCHAR"/>
        <result property="isLeave" column="is_leave" jdbcType="INTEGER"/>
        <result property="insState" column="ins_state" jdbcType="INTEGER"/>
        <result property="joinNum" column="join_num" jdbcType="INTEGER"/>
        <result property="remark" column="remark" jdbcType="VARCHAR"/>
@@ -152,7 +151,8 @@
               ipr.com_value,
               ipr.equip_value,
               ipr.equip_name,
               ip.method_s
               ip.method_s,
               ip.tell
        from ins_sample isa
        left join ins_product ip on isa.id = ip.ins_sample_id
        left join ins_product_result ipr on ip.id = ipr.ins_product_id
@@ -177,7 +177,6 @@
        <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
        <result property="sample" column="sample" jdbcType="VARCHAR"/>
        <result property="model" column="model" jdbcType="VARCHAR"/>
        <result property="isLeave" column="is_leave" jdbcType="INTEGER"/>
        <result property="insState" column="ins_state" jdbcType="INTEGER"/>
        <result property="joinNum" column="join_num" jdbcType="INTEGER"/>
        <result property="remark" column="remark" jdbcType="VARCHAR"/>
@@ -225,6 +224,7 @@
        <result property="updateTime" column="ip_update_time" jdbcType="TIMESTAMP"/>
        <result property="templateId" column="template_id" jdbcType="INTEGER"/>
        <result property="methodS" column="method_s"/>
        <result property="tell" column="tell"/>
        <collection property="insProductResult" resultMap="insProductResult"/>
    </resultMap>


 user-server/src/main/java/com/yuanchu/mom/pojo/User.java

@@ -35,9 +35,9 @@
    @ApiModelProperty(value = "姓名")
    private String name;

//    @ValueTableShow(2)
//    @ApiModelProperty(value = "姓名EN")
//    private String nameEn;
    @ValueTableShow(2)
    @ApiModelProperty(value = "姓名EN")
    private String nameEn;

    @ValueTableShow(3)
    @ApiModelProperty(value = "状态")

 user-server/src/main/resources/mapper/EnumMapper.xml

@@ -30,5 +30,6 @@
        select e.id,e.category,e.label,e.value,e.order_num,e.type
        from enums e
        where e.category=#{category}
        order by e.order_num
    </select>
</mapper>

 user-server/src/main/resources/mapper/UserMapper.xml

@@ -5,7 +5,8 @@
        select * from (
        select u1.id, u1.account, u1.name, u1.state, u1.create_time, u1.update_time, u1.create_user, u1.update_user,
        u1.age, u1.email, u1.phone, u1.department, u1.company, u1.address, u1.is_custom, u1.role_id, u2.name
        create_user_name, u3.name update_user_name, r.name role_name,u1.signature_url,u1.picture_url,u1.depart_id
        create_user_name, u3.name update_user_name, r.name role_name,u1.signature_url,u1.picture_url,u1.depart_id,
        u1.name_en
        from user u1
        left join user u2 on u2.id = u1.create_user
        left join user u3 on u3.id = u1.update_user