| src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java
@@ -22,7 +22,7 @@ @Id @Column(name = "xzbm", length = 12) @PropertyDef(label = "熏蒸备案编号", description = "4位顺序号") @PropertyDef(label = "熏蒸备案编号", description = "yyyyMMDD+4位顺序号") private String xzbm; @Column(name = "DEPT_ID_", length = 21) src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
@@ -19,6 +19,7 @@ import com.fzzy.push.gd2022.dto.Gd2022Api1023Way; import com.fzzy.push.gd2022.ApiCodeConstant; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -117,7 +118,7 @@ GD2022Api1023.setLqrq(data.getLqsj()); GD2022Api1023.setZhgxsj(data.getUpdateTime()); if(data.getLqr().contains("、")){ GD2022Api1023.setLqr(data.getLqr().replace('、', '|')); GD2022Api1023.setLqr(data.getLqr().replace("、", "|")); } //储粮粮情明细表 @@ -131,7 +132,7 @@ } //粮食品种 String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, data.getFoodVariety()); String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, data.getFoodVariety().substring(0, 3)); gd2022Api1023Dtl.setLspzdm(mappingCode); gd2022Api1023Dtl.setLsxzdm(data.getFoodType()); gd2022Api1023Dtl.setLsdjdm(data.getFoodLevel()); @@ -184,6 +185,10 @@ gd2022Api1023People = new Gd2022Api1023People(); BeanUtils.copyProperties(people, gd2022Api1023People); gd2022Api1023People.setXm(people.getMx()); if(StringUtils.isEmpty(gd2022Api1023People.getZyzg())){ gd2022Api1023People.setZyzg("高级"); } peopleList.add(gd2022Api1023People); } GD2022Api1023.setPeoples(peopleList); @@ -197,16 +202,15 @@ infoData.setBizType(PushProtocol.SB_GD_2022.getCode()); infoData.setUpdateTime(new Date()); infoData.setDataId(data.getXzbm()); infoData.setId(data.getXzbm()); apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), kqdm); if (null == apiInfoList || apiInfoList.isEmpty()) { GD2022Api1023.setCzbz(Constant.CZBZ_I); infoData.setCzbz(Constant.CZBZ_I); infoData.setId(ContextUtil.getUUID()); } else { GD2022Api1023.setCzbz(apiInfoList.get(0).getCzbz()); infoData.setCzbz(apiInfoList.get(0).getCzbz()); infoData.setId(apiInfoList.get(0).getId()); } infoData.setData(JSON.toJSONString(GD2022Api1023)); src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
@@ -532,6 +532,13 @@ <Property name="align">center</Property> </DataColumn> </DataGrid> <ToolBar layoutConstraint="bottom"> <Fill/> <DataPilot> <Property name="itemCodes">pageSize,pages</Property> <Property name="dataSet">dsMain</Property> </DataPilot> </ToolBar> <Dialog id="dialogMain" layout="regionPadding:5"> <Property name="width">85%</Property> <Property name="closeable">false</Property> src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
@@ -19,6 +19,7 @@ import com.fzzy.push.gd2022.dto.Gd2022Api1023; import com.fzzy.push.gd2022.ApiCodeConstant; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.DateFormatUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; @@ -108,7 +109,7 @@ @DataResolver public void saveData(Gd2022Api1023 data) { ApiInfoData infoData; List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm()); List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm(), data.getKqdm()); if (apiInfoList.size() != 0) { infoData = apiInfoList.get(0); infoData.setData(JSON.toJSONString(data)); @@ -131,7 +132,7 @@ */ @Expose public void delData(Gd2022Api1023 data) { List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm()); List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm(), data.getKqdm()); apiInfoDataRep.deleteById(apiInfoList.get(0).getId()); } @@ -143,7 +144,7 @@ if (null == data) { return "无数据执行"; } List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm()); List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm(), data.getKqdm()); data.setCzbz(Constant.CZBZ_D); apiInfoDataRep.updateStatus(apiInfoList.get(0).getId(), JSON.toJSONString(data), Constant.CZBZ_D); return null; @@ -183,7 +184,7 @@ if (responseDto.getSuccess() == 0) { if (Constant.CZBZ_I.equals(data.getCzbz())) { //推送成功，更新数据上传状态 List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm()); List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm(), data.getKqdm()); data.setCzbz(Constant.CZBZ_U); infoData = apiInfoList.get(0); infoData.setUpdateTime(new Date());
