QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:87552

Browse Source
This commit is contained in:
梁琦涛
2024-07-26 10:38:54 +08:00
parent 80ea18384a
commit ad9cce2784
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/LawsUnifiedTodoLogServiceImpl.java
+1 -1
View File
@@ -68,7 +68,7 @@ public class LawsUnifiedTodoLogServiceImpl extends ServiceImpl<LawsUnifiedTodoLo
if(Objects.isNull(lawsUnifiedTodoLogObj)){
return Result.error("数据不存在");
}
// todo 重新发送代办
// todo 重新发送代办 根据类型发送
// pushWorkflowIntegrationAPI.sendTodoTask();
LambdaUpdateWrapper<LawsUnifiedTodoLog> queryLawsUnifiedTodoLog = new LambdaUpdateWrapper<>();
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
+30
View File
@@ -19,6 +19,10 @@ import com.jero.modules.laws.marketStandard.entity.MarketStandardDetailVO;
import com.jero.modules.laws.marketStandard.mapper.LawsMarketStandardMapper;
import com.jero.modules.laws.marketStandard.service.ILawsMarketStandardDetailService;
import com.jero.modules.laws.marketStandard.service.ILawsMarketStandardService;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -60,6 +64,10 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
private ISysBaseAPI sysBaseAPI;
@Resource
private IProcessMarketStandardReleaseService processMarketStandardReleaseService;
@Resource
private ILawsEnterpriseStandardService lawsEnterpriseStandardService;
@Resource
private ILawsDomesticStandardService lawsDomesticStandardService;
public static final String CLASS = "entity";
public static final String PARAMS = "params";
@@ -437,6 +445,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
}
@Override
@Transactional(rollbackFor = JeroBootException.class)
public synchronized Result<?> publish(String id) {
LawsMarketStandard lawsMarketStandardOld = getById(id);
if(Objects.isNull(lawsMarketStandardOld)){
@@ -460,6 +469,27 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
updateLawsMarketStandard.set(LawsMarketStandard::getUpdateTime,new Date());
updateLawsMarketStandard.set(LawsMarketStandard::getUpdateBy,sysUser.getUsername());
update(updateLawsMarketStandard);
// 更新标准的市场数据
LambdaQueryWrapper<LawsMarketStandardDetail> queryLawsMarketStandardDetail = new LambdaQueryWrapper<>();
queryLawsMarketStandardDetail.eq(LawsMarketStandardDetail::getManifestId,id);
List<LawsMarketStandardDetail> listLawsMarketStandardDetail = lawsMarketStandardDetailService
.list(queryLawsMarketStandardDetail);
if(CollectionUtils.isEmpty(listLawsMarketStandardDetail)){
return Result.OK("发布成功");
}
List<LawsDomesticStandard> listLawsDomesticStandard = new ArrayList<>();
String country = lawsMarketStandardOld.getCountry();
for (LawsMarketStandardDetail lawsMarketStandardDetail : listLawsMarketStandardDetail) {
String countryDetail = lawsMarketStandardDetail.getCountry();
String dis = StringUtils.isEmpty(countryDetail) ? country : country + "," + countryDetail;
List<String> data = Arrays.stream(dis.split(",")).distinct().collect(Collectors.toList());
LawsDomesticStandard lawsDomesticStandard = new LawsDomesticStandard();
lawsDomesticStandard.setId(lawsMarketStandardDetail.getStandardId());
lawsDomesticStandard.setApplicableMarket(String.join(",",data));
listLawsDomesticStandard.add(lawsDomesticStandard);
}
lawsDomesticStandardService.updateBatchById(listLawsDomesticStandard);
return Result.OK("发布成功");
}