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

新增 国内外入库、新增、修改时对代替标准号所对应老标准的文本状态

Browse Source
This commit is contained in:
SUNJIABIN
2023-04-25 17:52:16 +08:00
parent 239c535b12
commit 11193a3c93
4 changed files with 73 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
+20
View File
@@ -20,6 +20,7 @@ import com.adc.da.slrs.sarStandAttrInfo.service.ISarStandAttrInfoService;
import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao;
import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
import com.adc.da.slrs.sarStandVal.entity.SarStandVal;
import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
@@ -88,6 +89,9 @@ public class ActSarItemsEOService {
@Autowired
private SarStandItemValDao sarStandItemValEODao;
@Autowired
private SarStandardsInfoDao sarStandardsInfoDao;
@Value("${elas.flag}")
private boolean elasflag;
@@ -192,6 +196,22 @@ public class ActSarItemsEOService {
// attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus());
String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
sarStandardsInfoEO.setSarStandAttrEOStr(resData);
if (org.apache.commons.lang3.StringUtils.isNotBlank(sarStandardsInfoEO.getReplaceStandNum())){
sarStandardsInfoDao.updateById(sarStandardsInfoEO);
String id = sarStandardsInfoEO.getStandName();
SarStandardsInfo sarStandardsInfo = sarStandardsInfoDao.selectBy(id);
if (sarStandardsInfo != null){
String textStatus = "chblaarg77";
sarStandardsInfo.setTextStatus(textStatus);
sarStandardsInfoDao.updateById(sarStandardsInfo);
}
SarStandardsInfo sarStandardsInfo1 = sarStandardsInfoDao.selectBy1(id);
if (sarStandardsInfo1 != null){
String textStatus = "chblaarg77";
sarStandardsInfo1.setTextStatus(textStatus);
sarStandardsInfoDao.updateById(sarStandardsInfo1);
}
}
// 根据标准号判断数据是否已存在
//2021年4月9日 此处检查当前是否存在standId
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
+5
View File
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository;
import javax.annotation.Resource;
@@ -117,5 +118,9 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
List<SarStandardsInfo> listQuery2(SarStandardsInfoEOPage page);
List<SarStandardsInfo> selectStandardsByStandnumber2(SarStandardsInfo sarStandardsInfoEO);
SarStandardsInfo selectBy(String id);
SarStandardsInfo selectBy1(String id);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+17
View File
@@ -88,6 +88,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.sf.json.JSONObject;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.util.PDFTextStripper;
@@ -1329,6 +1330,22 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
// 多时间处理
createStandPutTime(sarStandardsInfoEO.getId(), multiTimeMap);
}
if (StringUtils.isNotBlank(sarStandardsInfoEO.getReplaceStandNum())){
dao.updateById(sarStandardsInfoEO);
String id = sarStandardsInfoEO.getStandName();
SarStandardsInfo sarStandardsInfo = dao.selectBy(id);
if (sarStandardsInfo != null){
String textStatus = "chblaarg77";
sarStandardsInfo.setTextStatus(textStatus);
dao.updateById(sarStandardsInfo);
}
SarStandardsInfo sarStandardsInfo1 = dao.selectBy1(id);
if (sarStandardsInfo1 != null){
String textStatus = "chblaarg77";
sarStandardsInfo1.setTextStatus(textStatus);
dao.updateById(sarStandardsInfo1);
}
}
}
/***
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+31
View File
@@ -2039,5 +2039,36 @@
</if>
</select>
<select id="selectBy" resultType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo">
select
ssi2.id
from
SAR_STANDARDS_INFO ssi,
SAR_STANDARDS_INFO ssi2
where
<if test="standSort !=null and standNumber !=null and standYear !=null">
ssi.REPLACE_STAND_NUM = concat(ssi2.STAND_SORT,' ',ssi2.STAND_NUMBER,'-',ssi2.STAND_YEAR)
</if>
<if test="standSort !=null and standNumber !=null and standYear ==null">
ssi.REPLACE_STAND_NUM = concat(ssi2.STAND_SORT,' ',ssi2.STAND_NUMBER)
</if>
and ssi.STAND_NAME = #{id}
</select>
<select id="selectBy1" resultType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo">
select
ssi2.id
from
SAR_STANDARDS_INFO ssi,
SAR_STANDARDS_INFO ssi2
where
<if test="standSort !=null and standNumber !=null and standYear !=null">
ssi.REPLACE_STAND_NUM = concat(ssi2.STAND_SORT,ssi2.STAND_NUMBER,'-',ssi2.STAND_YEAR)
</if>
<if test="standSort !=null and standNumber !=null and standYear ==null">
ssi.REPLACE_STAND_NUM = concat(ssi2.STAND_SORT,ssi2.STAND_NUMBER)
</if>
and ssi.STAND_NAME = #{id}
</select>
</mapper>