参数项历史收集清单-查询本清单所有责任领域

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java

@@ -706,6 +706,15 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 	public Result<?> queryDutyTerritory(@RequestParam(name="id",required=true) String id) {
 		return this.paramsCollectManifestEOService.queryDutyTerritory(id);
 	}
+	/**
+	 *  查询本清单所有责任领域
+	 */
+	@AutoLog(value = "参数项历史收集清单-查询本清单所有责任领域")
+	@ApiOperation(value="参数项历史收集清单-查询本清单所有责任领域", notes="参数项历史收集清单-查询本清单所有责任领域")
+	@GetMapping(value = "/queryDutyTerritoryHistory")
+	public Result<?> queryDutyTerritoryHistory(@RequestParam(name="id",required=true) String id) {
+		return this.paramsCollectManifestEOService.queryDutyTerritoryHistory(id);
+	}
 
 	/**
 	 * 某个项目责任领域下-工程接口人

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java

@@ -1,11 +1,9 @@
 package com.jero.modules.cert.collect.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.entity.ParamsManifestEO;
-import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -41,5 +39,7 @@ public interface ParamsCollectManifestEOMapper extends BaseMapper<ParamsCollectM
 
     List<String> queryDutyTerritory(@Param("paramsManifestId") String paramsManifestId);
 
+    List<String> queryDutyTerritoryHistory(@Param("paramsManifestId") String paramsManifestId);
+
 
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml

@@ -159,5 +159,8 @@
     <select id="queryDutyTerritory" resultType="java.lang.String">
         SELECT duty_territory FROM params_collect_manifest WHERE params_manifest_id = #{paramsManifestId} GROUP BY duty_territory
     </select>
+    <select id="queryDutyTerritoryHistory" resultType="java.lang.String">
+        SELECT duty_territory FROM params_collect_manifest_history WHERE params_manifest_id = #{paramsManifestId} GROUP BY duty_territory
+    </select>
 
 </mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java

@@ -206,4 +206,5 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
     List<ParamsCollectManifestEO> getList(Map<String,Object> params);
 
 	Result<?> queryDutyTerritory(String id);
+	Result<?> queryDutyTerritoryHistory(String id);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -7655,4 +7655,22 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         }
         return Result.OK(resList);
     }
+    @Override
+    public Result<?> queryDutyTerritoryHistory(String paramsManifestId) {
+        List<String> dtList = paramsCollectManifestEOMapper.queryDutyTerritoryHistory(paramsManifestId);
+        List<SysDictItem> dtSdiList = sysDictItemService.selectItemsByDictCode("duty_territory");
+        Map<String,String> dictItemsMap = dtSdiList.stream().collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName));
+        JSONArray resList = new JSONArray();
+        if(ObjectUtils.isNotEmpty(dtList)){
+            for (String dtId : dtList) {
+                if(StringUtils.isNotBlank(dtId)){
+                    JSONObject dt = new JSONObject();
+                    dt.put("key",dtId);
+                    dt.put("value",dictItemsMap.get(dtId));
+                    resList.add(dt);
+                }
+            }
+        }
+        return Result.OK(resList);
+    }
 }