|
@@ -13,6 +13,7 @@ import com.github.pagehelper.PageInfo;
|
|
|
import com.ruoyi.common.config.RuoYiConfig;
|
|
|
import com.ruoyi.common.constant.HttpStatus;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
+import com.ruoyi.common.core.domain.entity.InvestigateDisposition;
|
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
|
import com.ruoyi.common.utils.DateUtils;
|
|
|
import com.ruoyi.common.utils.SendSmsUtils;
|
|
@@ -21,6 +22,7 @@ import com.ruoyi.common.utils.file.FileUploadUtils;
|
|
|
import com.ruoyi.common.utils.file.FileUtils;
|
|
|
import com.ruoyi.system.domain.InvestigateDispositionTable;
|
|
|
import com.ruoyi.system.domain.InvestigateUser;
|
|
|
+import com.ruoyi.system.mapper.InvestigateDispositionMapper;
|
|
|
import com.ruoyi.system.mapper.InvestigateDispositionTableMapper;
|
|
|
import com.ruoyi.system.mapper.InvestigateUserMapper;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -49,6 +51,9 @@ public class InvestigateTableServiceImpl implements IInvestigateTableService {
|
|
|
@Autowired
|
|
|
private InvestigateUserMapper investigateUserMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private InvestigateDispositionMapper investigateDispositionMapper;
|
|
|
+
|
|
|
/**
|
|
|
* 查询考察主
|
|
|
*
|
|
@@ -121,6 +126,22 @@ public class InvestigateTableServiceImpl implements IInvestigateTableService {
|
|
|
|
|
|
insertInvestigateDispositionTable(investigateTableId,investigateDispositionTableList);
|
|
|
}
|
|
|
+ //单独查询考察点信息,新增到关联表
|
|
|
+ String investigateDispositionIds = investigateTable.getInvestigateDispositionIds();
|
|
|
+ List<InvestigateDispositionTable> investigateDispositionTableListKaoCha = new ArrayList<>();
|
|
|
+ if (StringUtils.isNotEmpty(investigateDispositionIds)){
|
|
|
+ for (String investigateDispositionId: investigateDispositionIds.split(",")) {
|
|
|
+ InvestigateDispositionTable investigateDispositionTable = new InvestigateDispositionTable();
|
|
|
+ investigateDispositionTable.setInvestigateTableId(investigateTableId);
|
|
|
+ InvestigateDisposition investigateDisposition = investigateDispositionMapper.selectInvestigateDispositionByInvestigateDispositionId(Long.parseLong(investigateDispositionId));
|
|
|
+ investigateDispositionTable.setInvestigateDispositionId(investigateDisposition.getInvestigateDispositionId());
|
|
|
+ investigateDispositionTable.setUrl(investigateDisposition.getUrl());
|
|
|
+ investigateDispositionTable.setTitle(investigateDisposition.getTitle());
|
|
|
+ investigateDispositionTable.setContent(investigateDisposition.getContent());
|
|
|
+ investigateDispositionTableListKaoCha.add(investigateDispositionTable);
|
|
|
+ }
|
|
|
+ investigateDispositionTableMapper.batchDispositionTable(investigateDispositionTableListKaoCha);
|
|
|
+ }
|
|
|
return i;
|
|
|
}
|
|
|
|