修改获取设备列表接口，修改通过设备id获取设备详情接口

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/EquipmentDto.java

@@ -59,4 +59,6 @@ public class EquipmentDto  extends BaseDto {
     @ApiModelProperty(value = "单位机构代码")
     private String orgCode;
 
+    private String companyName;
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/EquipmentMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.ugp.api.mapper.EquipmentMapper">
 
-    <select id="queryEquipmentPage"  resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Equipment">
+    <select id="queryEquipmentPage"  resultType="com.yeejoin.amos.boot.module.ugp.api.dto.EquipmentDto">
         select * from tz_ugp_equipment
         <where>
             <if test="equipment.name != '' and equipment.name != null">

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/EquipmentController.java

@@ -142,8 +142,14 @@ public class EquipmentController extends BaseController {
 		IPage<EquipmentDto> page = new Page<>();
 		page.setSize(size);
 		page.setCurrent(current);
-//		equipment.setCompanyId(orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr());
-		return ResponseHelper.buildResponse(equipmentServiceImpl.queryEquipmentPage(page,equipment));
+		page = equipmentServiceImpl.queryEquipmentPage(page,equipment);
+		List<EquipmentDto> equipments = page.getRecords();
+		if(!ValidationUtil.isEmpty(equipments)) {
+			for (EquipmentDto equipmentDto : equipments) {
+				equipmentDto.setCompanyName((String) orgService.getdetialInfo(String.valueOf(equipmentDto.getCompanyId())).get("name"));
+			}
+		}
+		return ResponseHelper.buildResponse(page);
 	}
 
 	/**

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java

@@ -78,11 +78,6 @@ public class ProjectController extends BaseController {
 	public ResponseModel<ProjectDto> save(@RequestBody ProjectDto model) {
 		String regionName = "",regionCode = "";
 		Map<String,String> map = getInfo(regionName,regionCode,Long.valueOf(model.getInstallRegionCode()));
-		try {
-			model.setStartDate(new SimpleDateFormat("yyy-MM-dd HH:mm:ss").parse(model.getStartDateString()));
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
 		model.setSubmitDate(new Date());
 		model.setInstallationUnit(orgServiceImpl.getOrgUsrById(String.valueOf(model.getInstallationUnitId())).getBizOrgName());
 		model.setDesignUnit(orgServiceImpl.getOrgUsrById(String.valueOf(model.getDesignUnitId())).getBizOrgName());
@@ -139,11 +134,6 @@ public class ProjectController extends BaseController {
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新项目信息表", notes = "根据sequenceNbr更新项目信息表")
 	public ResponseModel<ProjectDto> updateBySequenceNbrProject(@RequestBody ProjectDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-		try {
-			model.setStartDate(new SimpleDateFormat("yyy-MM-dd HH:mm:ss").parse(model.getStartDateString()));
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
 		model.setRecDate(new Date());
 		model.setSequenceNbr(sequenceNbr);
 		return ResponseHelper.buildResponse(projectServiceImpl.updateWithModel(model));

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -77,7 +78,11 @@ public class OrgServiceImpl {
             BeanUtils.copyProperties(dynamicFormColumn, dynamicFormInstance);
             dynamicFormInstance.setFormColumnId(dynamicFormColumn.getSequenceNbr());
             //通过字段名去拿到表单传来的值
-            dynamicFormInstance.setFieldValue(jsonObject.getString(dynamicFormInstance.getFieldCode()));
+            if("image".equals(dynamicFormColumn.getFieldCode())){
+                dynamicFormInstance.setFieldValue(JSON.toJSONString(jsonObject.getJSONArray(dynamicFormInstance.getFieldCode())));
+            }else{
+                dynamicFormInstance.setFieldValue(jsonObject.getString(dynamicFormInstance.getFieldCode()));
+            }
             dynamicFormInstance.setInstanceId(orgUsr.getSequenceNbr());
             dynamicFormInstance.setSequenceNbr(null);
             dynamicFormInstanceList.add(dynamicFormInstance);
@@ -235,7 +240,13 @@ public class OrgServiceImpl {
         map.put("type",type);
         map.put("sequenceNbr",sequenceNbr);
         for (DynamicFormInstance dynamicFormInstance : dynamicFormInstanceList) {
-            map.put(dynamicFormInstance.getFieldCode(),dynamicFormInstance.getFieldValue());
+            if("image".equals(dynamicFormInstance.getFieldCode())){
+                if(!ValidationUtil.isEmpty(dynamicFormInstance.getFieldValue())){
+                    map.put(dynamicFormInstance.getFieldCode(),JSON.parseArray(dynamicFormInstance.getFieldValue()));
+                }
+            } else {
+                map.put(dynamicFormInstance.getFieldCode(), dynamicFormInstance.getFieldValue());
+            }
         }
         return map;
     }