|
@@ -1,14 +1,20 @@
|
|
|
package com.miniframe.bisiness.es;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import com.miniframe.core.ExecProcessFlow;
|
|
|
import com.miniframe.core.ext.UtilTools;
|
|
|
import com.miniframe.generate.business.es.model.ES0015BaseModel;
|
|
|
+import com.miniframe.generate.comm.es.D_ES0015_ROWS_COMS_RECODE;
|
|
|
import com.miniframe.generate.comm.es.D_ES0015_ROWS_RECODE;
|
|
|
import com.miniframe.model.es.EsProResultKey;
|
|
|
import com.miniframe.model.es.EsProResultKeySQLBuilder;
|
|
|
+import com.miniframe.model.es.EsProResultValue;
|
|
|
+import com.miniframe.model.es.EsProResultValueSQLBuilder;
|
|
|
import com.miniframe.model.es.dao.EsProResultKeyMapper;
|
|
|
+import com.miniframe.model.es.dao.EsProResultValueMapper;
|
|
|
+import com.miniframe.tools.XIDateTimeUtils;
|
|
|
|
|
|
/**
|
|
|
* 无锡发动机,“结果属性值查询”逻辑处理(重新生成不覆盖)。
|
|
@@ -29,6 +35,48 @@ public class ES0015Service extends ES0015BaseModel implements ExecProcessFlow {
|
|
|
eprkbc.andPcIdEqualTo(pcId);
|
|
|
EsProResultKeyMapper mapper = UtilTools.getBean(EsProResultKeyMapper.class);
|
|
|
List<EsProResultKey> eprkList = mapper.selectByExample(builder);
|
|
|
+ List<D_ES0015_ROWS_RECODE> rowList = new ArrayList<D_ES0015_ROWS_RECODE>();
|
|
|
+ for(EsProResultKey eprk : eprkList){
|
|
|
+ D_ES0015_ROWS_RECODE dr = new D_ES0015_ROWS_RECODE();
|
|
|
+ String pcrId = eprk.getPcrId();
|
|
|
+ dr.setPcrId(pcrId);
|
|
|
+ dr.setPId(eprk.getPid());
|
|
|
+ dr.setComId(eprk.getComId());
|
|
|
+ dr.setPcId(eprk.getPcId());
|
|
|
+ dr.setJobId(eprk.getJobId());
|
|
|
+ dr.setKeyEn(eprk.getKeyEn());
|
|
|
+ dr.setKeyZh(eprk.getKeyZh());
|
|
|
+ dr.setUid(eprk.getUid());
|
|
|
+ dr.setCreateTime(XIDateTimeUtils.getStrFromDate(eprk.getCreateTime()));
|
|
|
+ dr.setUpdateTime(XIDateTimeUtils.getStrFromDate(eprk.getUpdateTime()));
|
|
|
+ dr.setRemark(eprk.getRemark());
|
|
|
+
|
|
|
+ EsProResultValueSQLBuilder valuebuilder = new EsProResultValueSQLBuilder();
|
|
|
+ EsProResultValueSQLBuilder.Criteria valueCriteria = valuebuilder.createCriteria();
|
|
|
+ valueCriteria.andPcrIdEqualTo(pcrId);
|
|
|
+ EsProResultValueMapper valueMapper = UtilTools.getBean(EsProResultValueMapper.class);
|
|
|
+ List<EsProResultValue> valueList = valueMapper.selectByExample(valuebuilder);
|
|
|
+ List<D_ES0015_ROWS_COMS_RECODE> comsRecodeList = new ArrayList<D_ES0015_ROWS_COMS_RECODE>();
|
|
|
+ for (EsProResultValue value : valueList) {
|
|
|
+ D_ES0015_ROWS_COMS_RECODE comsRecode = new D_ES0015_ROWS_COMS_RECODE();
|
|
|
+ comsRecode.setPcrvId(value.getPcrvId());
|
|
|
+ comsRecode.setPcrId(value.getPcrId());
|
|
|
+ comsRecode.setPId(value.getPid());
|
|
|
+ comsRecode.setComId(value.getComId());
|
|
|
+ comsRecode.setPcId(value.getPcId());
|
|
|
+ comsRecode.setJobId(value.getJobId());
|
|
|
+ comsRecode.setValue(value.getValue().toString());
|
|
|
+ comsRecode.setUid(value.getUid());
|
|
|
+ comsRecode.setCreateTime(XIDateTimeUtils.getStrFromDate(value.getCreateTime()));
|
|
|
+ comsRecode.setUpdateTime(XIDateTimeUtils.getStrFromDate(value.getUpdateTime()));
|
|
|
+ comsRecode.setRemark(value.getRemark());
|
|
|
+ comsRecode.setStep(value.getStep());
|
|
|
+ comsRecodeList.add(comsRecode);
|
|
|
+ }
|
|
|
+ dr.setComs(comsRecodeList);
|
|
|
+ rowList.add(dr);
|
|
|
+ }
|
|
|
+ this.getD_es0015().setRows(rowList);
|
|
|
}
|
|
|
|
|
|
/**
|