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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/DataDictionaryController.java

@@ -186,6 +186,23 @@ public class DataDictionaryController extends BaseController {
 		}
 	}
 
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/getDataDictionary/{type}", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典", notes = "根据字典类型查询字典")
+	public ResponseModel<Object> getDataDictionary(@PathVariable String type) throws Exception {
+		// 数据字典生成树方法 原先通过getCode做主键 现修改为 getSequenceNbr 后期数据字典parent字段保存id 而不要保存code by
+		// kongfm 2021-09-08
+		// 数据字典还原 by kongfm 2021-09-09
+		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("type", type);
+		queryWrapper.eq("is_delete", false);
+		queryWrapper.orderByAsc("sort_num");
+		Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+
+	return ResponseHelper.buildResponse(list);
+	}
+
+
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/dataDictionaryIdFillMenu", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典,id为SequenceNbr", notes = "根据字典类型查询字典,id为SequenceNbr")

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionApplicationAttachmentMapper.java

@@ -3,6 +3,9 @@ package com.yeejoin.amos.boot.module.jyjc.api.mapper;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationAttachment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  *  Mapper 接口
  *
@@ -13,4 +16,6 @@ public interface JyjcInspectionApplicationAttachmentMapper extends BaseMapper<Jy
 
    public void deleteByApplicationSeq(Long applicationSeq);
 
+  public List<Map<String,Object>> getDataByApplicationSeq(Long applicationSeq);
+
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionApplicationModel.java

@@ -96,23 +96,44 @@ public class JyjcInspectionApplicationModel extends BaseModel {
 
     @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
     private String workflowNode;
+    
+ @ApiModelProperty(value = "告知书")
+ private List<Map<String,Object>> gzs;
+ @ApiModelProperty(value = "产品质量证明书")
+ private List<Map<String,Object>> cpzl;
+ @ApiModelProperty(value = "施工自行检查报告")
+ private List<Map<String,Object>> sgzx ;
+ @ApiModelProperty(value = "施工合同或证明")
+ private List<Map<String,Object>> sght;
+ @ApiModelProperty(value = "施工方案/施工设计文件")
+ private List<Map<String,Object>> sgfa;
+ @ApiModelProperty(value = "施工单位许可证书")
+ private List<Map<String,Object>> sgdwxk;
+ @ApiModelProperty(value = "型式试验证书")
+ private List<Map<String,Object>> xssy;
+ @ApiModelProperty(value = "限速器和渐进式安全钳的调试证书")
+ private List<Map<String,Object>> xsqts;
+ @ApiModelProperty(value = "土建声明")
+ private List<Map<String,Object>> tjsm;
+ @ApiModelProperty(value = "质量保证手册和程序文件")
+ private List<Map<String,Object>> zlbz;
+ @ApiModelProperty(value = "施工作业文件")
+ private List<Map<String,Object>> sgzy;
+ @ApiModelProperty(value = "施工人员、质量保证体系责任人、专业技术人员身份证、技术工人的身份证及资质证书")
+ private List<Map<String,Object>> sgry;
+ @ApiModelProperty(value = "产品技术文件")
+ private List<Map<String,Object>> cpjs;
+ @ApiModelProperty(value = "施工设计文件")
+ private List<Map<String,Object>> sgsj;
+ @ApiModelProperty(value = "施工分包方目录")
+ private List<Map<String,Object>> sgfb;
+ @ApiModelProperty(value = "分包方评价资料")
+ private List<Map<String,Object>> fbspj;
+ @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
+ private List<Map<String,Object>> equip;
 
-
-    @ApiModelProperty(value = "告知书")
-    private List<Map<String, Object>> gzs;
-    @ApiModelProperty(value = "产品质量证明书")
-    private List<Map<String, Object>> cpzl;
-    @ApiModelProperty(value = "施工自行检查报告")
-    private List<Map<String, Object>> sgzx;
-    @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
-    private List<Map<String, Object>> sght;
-    @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
-    private List<Map<String, Object>> sgfa;
-    @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
-    private List<Map<String, Object>> sgdwxk;
-    @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
-    private List<Map<String, Object>> equip;
     @ApiModelProperty("检验结果方式")
     private String resultType;
 
+
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationAttachmentMapper.xml

@@ -8,8 +8,16 @@
         from
         tz_jyjc_inspection_application_attachment
         where
-        application_seq = #{applicationSeq}
+        application_seq =
+        #{applicationSeq}
 
 
     </delete>
+    <select id="getDataByApplicationSeq" resultType="map">
+
+        select *
+        from tz_jyjc_inspection_application_attachment
+        where application_seq = #{applicationSeq}
+
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -7,9 +7,9 @@
         select
         tzjia.application_no,
         tzjia.inspection_type,
-        tzjia.inspection_classify,
+        (select name from  cb_data_dictionary  where cb_data_dictionary.code = tzjia.inspection_classify and cb_data_dictionary.type = 'JYJCLB') as inspectionClassify,
         tzjia.inspection_unit_code,
-        tzjia.equip_classify,
+        (select name from  cb_data_dictionary  where cb_data_dictionary.code = tzjia.equip_classify and cb_data_dictionary.type = 'BJSBZL') as equipClassify,
         tzjia.number_of_equip,
         tzjia.inspection_unit_code,
         tzjia.application_date,

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java

@@ -136,10 +136,8 @@ public class JyjcInspectionApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<JyjcInspectionApplicationModel> selectOne(@PathVariable Long sequenceNbr) {
-		jyjcInspectionApplicationServiceImpl.selectBySeq(sequenceNbr);
-
-	    return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryBySeq(sequenceNbr));
+	public ResponseModel<Map<String,Object>> selectOne(@PathVariable Long sequenceNbr) {
+		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.selectBySeq(sequenceNbr));
 	}
 
 	/**

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -215,9 +215,16 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         return this.queryForList("", false);
     }
 
-    public JyjcInspectionApplicationModel selectBySeq(Long sequenceNbr) {
-        JyjcInspectionApplicationModel model = this.selectBySeq(sequenceNbr);
-        return  model;
+    public Map<String,Object> selectBySeq(Long sequenceNbr) {
+        JyjcInspectionApplicationModel model = this.queryBySeq(sequenceNbr);
+        Map<String, Object> map = BeanUtil.beanToMap(model);
+        List<Map<String, Object>> dataByApplicationSeq = jyjcInspectionApplicationAttachmentService.getBaseMapper().getDataByApplicationSeq(sequenceNbr);
+        Map<String, Object> attMap = new HashMap<>();
+        for (Map<String, Object> maps : dataByApplicationSeq) {
+            attMap.put(maps.get("attachment_type").toString(),maps.get("attachment_url"));
+        }
+        map.putAll(attMap);
+        return  map;
     }