diff --git a/src/main/java/com/spring/ifs/api/BaseSearchApi.java b/src/main/java/com/spring/ifs/api/BaseSearchApi.java index 5db7b92d..31e49100 100644 --- a/src/main/java/com/spring/ifs/api/BaseSearchApi.java +++ b/src/main/java/com/spring/ifs/api/BaseSearchApi.java @@ -438,6 +438,7 @@ public class BaseSearchApi { searchSql.append(" to_char(START_DATE, 'yyyy-MM-dd') START_DATE, to_char(END_DATE, 'yyyy-MM-dd') END_DATE"); searchSql.append(" FROM ifsapp.WORK_CENTER_COST"); searchSql.append(" WHERE ifsapp.Work_Center_API.Get_Work_Center_Code_Db(contract, work_center_no) = 'I'"); + searchSql.append(" AND COST_SET = '1'"); //设置查询的入参 Map inParam = new HashMap<>(); @@ -447,7 +448,7 @@ public class BaseSearchApi { inParam.put("ifsRowVersion", ifsRowVersion); } //添加排序语句 - searchSql.append(" ORDER BY OBJVERSION, CONTRACT, WORK_CENTER_NO"); + searchSql.append(" ORDER BY CONTRACT, WORK_CENTER_NO, COST_SET, START_DATE"); //添加分页的查询语句 searchSql.append(" OFFSET "+startIndex+" ROWS FETCH NEXT "+pageSize+" ROWS ONLY"); logger.info("加工中心成本查询语句sql"+searchSql.toString()); @@ -472,6 +473,7 @@ public class BaseSearchApi { tempItem.setWorkCenterDesc(tempMap.get("WORKCENTERDESC")); tempItem.setCostSet(tempMap.get("COST_SET")); tempItem.setCostSetDesc(tempMap.get("COSTSETDESC")); + tempItem.setWcRate(tempMap.get("WC_RATE")); tempItem.setWcCostCode(tempMap.get("WC_COST_CODE")); tempItem.setOverhead1Fac(tempMap.get("OVERHEAD1_FAC")); tempItem.setOverhead2Fac(tempMap.get("OVERHEAD2_FAC")); diff --git a/src/main/java/com/spring/ifs/api/BaseSearchApiTest.java b/src/main/java/com/spring/ifs/api/BaseSearchApiTest.java index 4c2897f7..950dcb2b 100644 --- a/src/main/java/com/spring/ifs/api/BaseSearchApiTest.java +++ b/src/main/java/com/spring/ifs/api/BaseSearchApiTest.java @@ -432,6 +432,7 @@ public class BaseSearchApiTest { searchSql.append(" to_char(START_DATE, 'yyyy-MM-dd') START_DATE, to_char(END_DATE, 'yyyy-MM-dd') END_DATE"); searchSql.append(" FROM ifsapp.WORK_CENTER_COST"); searchSql.append(" WHERE ifsapp.Work_Center_API.Get_Work_Center_Code_Db(contract, work_center_no) = 'I'"); + searchSql.append(" AND COST_SET = '1'"); //设置查询的入参 Map inParam = new HashMap<>(); @@ -441,7 +442,7 @@ public class BaseSearchApiTest { inParam.put("ifsRowVersion", ifsRowVersion); } //添加排序语句 - searchSql.append(" ORDER BY OBJVERSION, CONTRACT, WORK_CENTER_NO"); + searchSql.append(" ORDER BY CONTRACT, WORK_CENTER_NO, COST_SET, START_DATE"); //添加分页的查询语句 searchSql.append(" OFFSET "+startIndex+" ROWS FETCH NEXT "+pageSize+" ROWS ONLY"); //调用查询的通用方法 @@ -464,6 +465,7 @@ public class BaseSearchApiTest { tempItem.setWorkCenterNo(tempMap.get("WORK_CENTER_NO")); tempItem.setWorkCenterDesc(tempMap.get("WORKCENTERDESC")); tempItem.setCostSet(tempMap.get("COST_SET")); + tempItem.setWcRate(tempMap.get("WC_RATE")); tempItem.setCostSetDesc(tempMap.get("COSTSETDESC")); tempItem.setWcCostCode(tempMap.get("WC_COST_CODE")); tempItem.setOverhead1Fac(tempMap.get("OVERHEAD1_FAC")); @@ -473,10 +475,14 @@ public class BaseSearchApiTest { String startDate = tempMap.get("START_DATE"); if (!(null == startDate || "".equals(startDate))){ tempItem.setBeginDate(DateUtils.getStringToDate(startDate, "yyyy-MM-dd")); + }else{ + tempItem.setBeginDate(null); } String endDate = tempMap.get("END_DATE"); if (!(null == endDate || "".equals(endDate))) { tempItem.setEndDate(DateUtils.getStringToDate(endDate, "yyyy-MM-dd")); + }else{ + tempItem.setEndDate(null); } //添加对象 technicalAttributes.add(tempItem); diff --git a/src/main/java/com/spring/ifs/bean/BaseSearchBean.java b/src/main/java/com/spring/ifs/bean/BaseSearchBean.java index 470e9274..422dd54d 100644 --- a/src/main/java/com/spring/ifs/bean/BaseSearchBean.java +++ b/src/main/java/com/spring/ifs/bean/BaseSearchBean.java @@ -229,7 +229,7 @@ public class BaseSearchBean { List resultList = new ArrayList<>(); int pageSize = 200; //迭代查询 - for(int i = 0; i < 10; i++){ + for(int i = 0; i < 100; i++){ int startIndex = i * pageSize; List tempList = BaseSearchApi.getWorkCenterCosts(srv, siteCon, ifsRowVersion, startIndex, pageSize); //判断查询是否结束 diff --git a/src/main/java/com/spring/ifs/bean/BaseSearchBeanTest.java b/src/main/java/com/spring/ifs/bean/BaseSearchBeanTest.java index 61e6c746..3f431f01 100644 --- a/src/main/java/com/spring/ifs/bean/BaseSearchBeanTest.java +++ b/src/main/java/com/spring/ifs/bean/BaseSearchBeanTest.java @@ -234,7 +234,7 @@ public class BaseSearchBeanTest { //获取连接 Server srv = ifsServer.getIfsServer(username, password); //迭代查询 - for(int i = 0; i < 10; i++){ + for(int i = 0; i < 20; i++){ int startIndex = i * pageSize; List tempList = BaseSearchApi.getWorkCenterCosts(srv, siteCon, ifsRowVersion, startIndex, pageSize); //判断查询是否结束 diff --git a/src/main/java/com/spring/modules/base/entity/WorkCenterCost.java b/src/main/java/com/spring/modules/base/entity/WorkCenterCost.java index 2ffb3d95..45014a70 100644 --- a/src/main/java/com/spring/modules/base/entity/WorkCenterCost.java +++ b/src/main/java/com/spring/modules/base/entity/WorkCenterCost.java @@ -6,9 +6,11 @@ import java.io.Serializable; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; - +import org.springframework.format.annotation.DateTimeFormat; + /** * (WorkCenterCost)实体类 * @@ -33,9 +35,11 @@ public class WorkCenterCost implements Serializable { private BigDecimal overhead2Cost; private String umId; - + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date beginDate; - + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endDate; private String remark;