FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613

Browse Source
This commit is contained in:
gaojiabao
2023-07-14 09:52:44 +08:00
parent 774dcb254d e09822233d
commit a7c56cc8a2
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java
+1 -1
View File
@@ -134,7 +134,7 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
SarBussionessStand selectByReplaceStandNum(String standCode);
@Select("select * from sar_bussioness_stand where TEXT_STATUS_BUSS is not null")
@Select("select * from sar_bussioness_stand where VALID_FLAG = 0 and TEXT_STATUS_BUSS is not null")
List<SarBussionessStand> selectAllStandStatus();
String selectMaxStandSn(String standSort);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java
+4 -2
View File
@@ -175,7 +175,8 @@ public class StateSync {
}
logger.info("月初:"+Thread.currentThread().getName() + " cron=0 0 1 1 * ? --- " + new Date()+"---End-01");
// logger.info("月初:"+Thread.currentThread().getName() + " cron=0 0 1 1 * ? --- " + new Date()+"---End-01");
logger.info("每天凌晨：{}， corn=0 0 0 * * ? --- {}，End-01",Thread.currentThread().getName(),new Date());
}catch(Exception e){
logger.info(e.getMessage());
}
@@ -308,9 +309,10 @@ public class StateSync {
SarBussionessStand sarBussionessStand2 = sarBussionessStandDao.selectByReplaceStandNum(sarBussionessStand.getReplaceStandNum());
//9z741h2m3j 有效，3lqnlgmgcn 作废
if (sarBussionessStand2 != null && (sarBussionessStand.getTextStatusBuss().equals("9z741h2m3j")|| sarBussionessStand.getTextStatusBuss().equals("3lqnlgmgcn"))){
logger.info("原企业标准的企业标准ID：{}，文本状态：{}",sarBussionessStand2.getId(), sarBussionessStand2.getTextStatusBuss());
sarBussionessStand2.setTextStatusBuss("3lqnlgmgcn");
sarBussionessStandDao.updateById(sarBussionessStand2);
logger.info("修改企业标准文本状态完成，修改的企业标准id为：" + sarBussionessStand2.getId() + ",企标名称为：" + sarBussionessStand2.getStandName() + ",企标编号为：" + sarBussionessStand2.getStandCode());
logger.info("修改企业标准文本状态完成，修改的企业标准id为：{}，企标名称为：{}，企标编号为：{}，企业标准文本状态修改为：{}", sarBussionessStand2.getId(), sarBussionessStand2.getStandName(),sarBussionessStand2.getStandCode(),sarBussionessStand2.getTextStatusBuss());
}
}
}
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+1 -1
View File
@@ -480,7 +480,7 @@
AND dicstandTextStatus.dic_id IS NOT NULL
AND dicstandTextStatus.valid_flag = 0
)
where 1=1
where SAR_BUSSIONESS_STAND.valid_flag = 0
<trim suffixOverrides="," >
<if test="QCDW != null and QCDW != ''" >
and SAR_BUSS_STAND_ATTR_INFO.QCDW like concat(concat('%',#{QCDW}),'%')