inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -1,5 +1,6 @@ package com.yuanchu.mom.service.impl; import cn.hutool.core.lang.Console; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -58,7 +59,7 @@ @Override public List<StandardProductList> selectStandardProductList(InsSample insSample) { String[] models = insSample.getModel().split("-(?=[^-]*$)");//拆分最后一个【-】 String[] factorys = insSample.getFactory().split(" - "); // String[] factorys = insSample.getFactory().split(" - "); //List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1).eq(StandardProductList::getModel, models[0]).eq(StandardProductList::getSampleType, factorys[2])); List<StandardProductList> list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, models[0]); if (list.size() == 0) { @@ -66,8 +67,9 @@ return null; } String[] split = insSample.getFactory().split(" - "); list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3]); /* list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery() String tree = split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3]; list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree); /* list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery() .eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()) .eq(StandardProductList::getState, 1) .like(StandardProductList::getTree, split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3]));*/ inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -78,7 +78,7 @@ select * from standard_product_list where standard_method_list_id = #{standardMethodListId} and state =#{state} and tree=#{tree} and tree like #{tree} order by case when man_hour_group is NULL then 1 when man_hour_group ='' then 1 else 0 end, CASE user-server/src/main/java/com/yuanchu/mom/pojo/AuthApi.java
@@ -9,7 +9,7 @@ /** * 正式地址 * */ public static String code = "https://ztt-sso.chinaztt.cn/oauth2/token"; public static String code = "https://ztt-sso.ztt.cn/oauth2/token"; /** * 河口人事测试库 @@ -32,17 +32,17 @@ // private String appId = "6f5f6a0c-2a01-4ef6-9e75-c8a6f0c2f044"; // private String appSecret = "89b9c4735b1e5ee9d6a8544b9b38bb03"; public static String companies = "https://ztt-connector.chinaztt.cn/api/org/v1/companies"; public static String companies = "https://ztt-connector.ztt.cn/api/org/v1/companies"; public static String simple="https://ztt-connector.chinaztt.cn/api/org/v1/employees/simple?companyId="; public static String simple="https://ztt-connector.ztt.cn/api/org/v1/employees/simple?companyId="; /** * 人员密码获取 * */ public static String password = "https://ztt-connector.chinaztt.cn/api/org/v1/employees/original_pwd/"; public static String password = "https://ztt-connector.ztt.cn/api/org/v1/employees/original_pwd/"; public static String department = "https://ztt-connector.chinaztt.cn/api/org/v1/companies/companyId/departments"; public static String department = "https://ztt-connector.ztt.cn/api/org/v1/companies/companyId/departments"; public static String person = "https://ztt-connector.chinaztt.cn/api/org/v1/employees/simple/"; public static String person = "https://ztt-connector.ztt.cn/api/org/v1/employees/simple/"; }
