Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrExcelDto.java

@@ -137,7 +137,7 @@ public class OrgUsrExcelDto extends BaseDto {
     private String  telephone;	//联系电话
 
     @ExcelProperty(value = "人员类型", index = 15)
-    @ExplicitConstraint(type = "DWRYLX", indexNum =15, sourceClass = CommonExplicitConstraint.class) //动态下拉内
+    @ExplicitConstraint( indexNum =15,  type = "DLRYLX", sourceClass = CommonExplicitConstraint.class) //动态下拉内
     private String peopleType;	//人员类型
 
     @ExplicitConstraint(indexNum = 16, sourceClass = CommonExplicitConstraint.class, method = "getNations") //固定下拉内容

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java

@@ -152,7 +152,7 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "高度（cm）", index = 11)
 	@ApiModelProperty(value = "高度（cm）")
-	private float height;
+	private Float height;
 
 	@ExcelIgnore
 	@ApiModelProperty(value = "水源可用状态类别代码")
@@ -182,15 +182,15 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "管网直径（cm）", index = 16)
 	@ApiModelProperty(value = "管网直径（cm）")
-	private float pipeDiameter;
+	private Float pipeDiameter;
 
 	@ExcelProperty(value = "进水管直径(cm)", index = 17)
 	@ApiModelProperty(value = "进水管直径(cm)")
-	private float inletPipeDiameter;
+	private Float inletPipeDiameter;
 
 	@ExcelProperty(value = "出水管直径(cm)", index = 18)
 	@ApiModelProperty(value = "出水管直径(cm)")
-	private float outletPipeDiameter;
+	private Float outletPipeDiameter;
 
 	@ExcelProperty(value = "加水车道数量(个)", index = 19)
 	@ApiModelProperty(value = "加水车道数量(个)")
@@ -255,11 +255,11 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "容积（m³）", index = 28)
 	@ApiModelProperty(value = "容积（m³）")
-	private float volume;
+	private Float volume;
 
 	@ExcelProperty(value = "面积（㎡）", index = 29)
 	@ApiModelProperty(value = "面积（㎡）")
-	private float area;
+	private Float area;
 
 	@ExcelProperty(value = "水质情况", index = 30)
 	@ApiModelProperty(value = "水质情况")
@@ -286,11 +286,11 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "取水高度(cm)", index = 34)
 	@ApiModelProperty(value = "取水高度(cm)")
-	private float intakeHeight;
+	private Float intakeHeight;
 
 	@ExcelProperty(value = "水源标高差(cm)", index = 35)
 	@ApiModelProperty(value = "水源标高差(cm)")
-	private float elevationDifference;
+	private Float elevationDifference;
 
 	@ExcelProperty(value = "停车位置", index = 36)
 	@ApiModelProperty(value = "停车位置")
@@ -374,11 +374,11 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "最低报警水位（m）", index = 43)
 	@ApiModelProperty(value = "最低报警水位（m）")
-	private float minWaterLevel;
+	private Float minWaterLevel;
 
 	@ExcelProperty(value = "最高报警水位（m）", index = 44)
 	@ApiModelProperty(value = "最高报警水位（m）")
-	private float maxWaterLevel;
+	private Float maxWaterLevel;
 
 	@ExcelIgnore
 	@ApiModelProperty("水池液位显示装置id")

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourceCrane.java

@@ -31,7 +31,7 @@ public class WaterResourceCrane extends BaseEntity {
 	  * 高度（cm）
      */
 	@TableField("height")
-    private float height;
+    private Float height;
     /**
 	  * 水源可用状态类别代码
      */
@@ -66,17 +66,17 @@ public class WaterResourceCrane extends BaseEntity {
 	  * 官网直径（cm）
      */
 	@TableField("pipe_diameter")
-    private float pipeDiameter;
+    private Float pipeDiameter;
     /**
 	  * 进水管直径(cm)
      */
 	@TableField("inlet_pipe_diameter")
-    private float inletPipeDiameter;
+    private Float inletPipeDiameter;
     /**
 	  * 出水管直径(cm)
      */
 	@TableField("outlet_pipe_diameter")
-    private float outletPipeDiameter;
+    private Float outletPipeDiameter;
     /**
 	  * 加水车道数量(个)
      */

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourceNatural.java

 package com.yeejoin.amos.boot.module.common.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
@@ -7,6 +8,8 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.apache.ibatis.type.JdbcType;
+
 /**
 * 
 *
@@ -31,7 +34,7 @@ public class WaterResourceNatural extends BaseEntity {
 	  * 高度（cm）
      */
 	@TableField("height")
-    private float height;
+    private Float height;
     /**
 	  * 水源类型代码
      */
@@ -46,12 +49,12 @@ public class WaterResourceNatural extends BaseEntity {
 	  * 容积（m³）
      */
 	@TableField("volume")
-    private float volume;
+    private Float volume;
     /**
 	  * 面积（㎡）
      */
 	@TableField("area")
-    private float area;
+    private Float area;
     /**
 	  * 水质情况
      */

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourcePool.java

@@ -31,7 +31,7 @@ public class WaterResourcePool extends BaseEntity {
 	  * 容积（m³）
      */
 	@TableField("volume")
-    private float volume;
+    private Float volume;
     /**
 	  * 水源可用状态类别代码
      */
@@ -56,12 +56,12 @@ public class WaterResourcePool extends BaseEntity {
 	  * 取水高度(cm)
      */
 	@TableField("intake_height")
-    private float intakeHeight;
+    private Float intakeHeight;
     /**
 	  * 水源标高差(cm)
      */
 	@TableField("elevation_difference")
-    private float elevationDifference;
+    private Float elevationDifference;
     /**
 	  * 停车位置
      */
@@ -92,13 +92,13 @@ public class WaterResourcePool extends BaseEntity {
      * 最低报警水位
      */
     @TableField("min_water_level")
-    private float minWaterLevel;
+    private Float minWaterLevel;
 
     /**
      * 最高报警水位
      */
     @TableField("max_water_level")
-    private float maxWaterLevel;
+    private Float maxWaterLevel;
 
     /**
      * 水池液位显示装置id

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java

@@ -12,6 +12,7 @@ import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmService;
 import com.yeejoin.equipmanage.service.IFireFightingSystemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -718,4 +719,70 @@ public class ConfigureController extends AbstractBaseController {
     }
 
 
+    @PersonIdentify
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getEquipExpiryStatistics")
+    @ApiOperation(httpMethod = "GET", value = "4小概览-韶山-临期设备统计", notes = "4小概览-韶山-临期设备统计")
+    public ResponseModel getEquipExpiryStatistics(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode,
+                                      @ApiParam("临期天数-近多少天") @RequestParam(value = "expiryDayNum", required = false) Integer expiryDayNum) {
+        if (ObjectUtils.isEmpty(bizOrgCode)) {
+            ReginParams reginParams = getSelectedOrgInfo();
+            ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+            if (!ValidationUtil.isEmpty(personIdentity)) {
+                bizOrgCode = personIdentity.getBizOrgCode();
+            }
+        }
+        if (ObjectUtils.isEmpty(bizOrgCode)) {
+            return CommonResponseUtil.success(null);
+        }
+        expiryDayNum = Objects.isNull(expiryDayNum) ? 60 : expiryDayNum;
+        return CommonResponseUtil.success(iFireFightingSystemService.getEquipExpiryStatistics(bizOrgCode, expiryDayNum));
+    }
+
+
+    @PersonIdentify
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getEquipExpiryListByPage")
+    @ApiOperation(httpMethod = "GET", value = "4小概览-韶山-临期设备列表", notes = "4小概览-韶山-临期设备列表")
+    public ResponseModel getEquipExpiryListByPage(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode,
+                                                  @ApiParam("临期天数-近多少天") @RequestParam(value = "expiryDayNum", required = false) Integer expiryDayNum,
+                                                  @RequestParam(value = "pageSize") Integer pageSize,
+                                                  @RequestParam(value = "pageNum") Integer pageNum) {
+        if (ObjectUtils.isEmpty(bizOrgCode)) {
+            ReginParams reginParams = getSelectedOrgInfo();
+            ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+            if (!ValidationUtil.isEmpty(personIdentity)) {
+                bizOrgCode = personIdentity.getBizOrgCode();
+            }
+        }
+        if (ObjectUtils.isEmpty(bizOrgCode)) {
+            return CommonResponseUtil.success(null);
+        }
+        expiryDayNum = Objects.isNull(expiryDayNum) ? 60 : expiryDayNum;
+        Page page = new Page(pageNum, pageSize);
+        return CommonResponseUtil.success(iFireFightingSystemService.getEquipExpiryListByPage(bizOrgCode, expiryDayNum, page));
+    }
+
+
+    @PersonIdentify
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getStockEquipStatistics")
+    @ApiOperation(httpMethod = "GET", value = "4小概览-韶山-报废设备统计", notes = "4小概览-韶山-报废设备统计")
+    public ResponseModel getStockEquipStatistics(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode) {
+        if (ObjectUtils.isEmpty(bizOrgCode)) {
+            ReginParams reginParams = getSelectedOrgInfo();
+            ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+            if (!ValidationUtil.isEmpty(personIdentity)) {
+                bizOrgCode = personIdentity.getBizOrgCode();
+            }
+        }
+        if (ObjectUtils.isEmpty(bizOrgCode)) {
+            return CommonResponseUtil.success(null);
+        }
+        //  重复列表组件只支持分页，所以组装数据
+        Page page = new Page(1, 4);
+        page.setTotal(4);
+        page.setRecords(iFireFightingSystemService.getStockEquipStatistics(bizOrgCode));
+        return CommonResponseUtil.success(page);
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java

@@ -608,4 +608,9 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
 
     BigDecimal getWaterPoolLevelByEquipSpeId(@Param("equipSpeId") String equipSpeId);
 
+    List<Map<String, String>> getEquipExpiryStatistics(@Param("bizOrgCode") String bizOrgCode, @Param("expiryDayNum") Integer expiryDayNum);
+
+    Page<Map<String, String>> getEquipExpiryListByPage(@Param("page") Page page, @Param("bizOrgCode") String bizOrgCode, @Param("expiryDayNum") Integer expiryDayNum);
+
+    List<Map<String, Integer>> getStockEquipStatistics(@Param("bizOrgCode") String bizOrgCode);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFireFightingSystemService.java

@@ -288,4 +288,9 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
 
     Page<Map<String, Object>> getSystemInfo(Page page, String companyCode, String systemCode);
 
+    List<Map<String, String>> getEquipExpiryStatistics(String bizOrgCode, Integer expiryDayNum);
+
+    Page<Map<String, String>> getEquipExpiryListByPage(String bizOrgCode, Integer expiryDayNum, Page page);
+
+    List<Map<String, Integer>> getStockEquipStatistics(String bizOrgCode);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -1999,4 +1999,19 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         }
         return fireFightingSystemMapper.getSystemInfo(page, bizOrgCode, null);
     }
+
+    @Override
+    public List<Map<String, String>> getEquipExpiryStatistics(String bizOrgCode, Integer expiryDayNum) {
+        return fireFightingSystemMapper.getEquipExpiryStatistics(bizOrgCode, expiryDayNum);
+    }
+
+    @Override
+    public Page<Map<String, String>> getEquipExpiryListByPage(String bizOrgCode, Integer expiryDayNum, Page page) {
+        return fireFightingSystemMapper.getEquipExpiryListByPage(page, bizOrgCode, expiryDayNum);
+    }
+
+    @Override
+    public List<Map<String, Integer>> getStockEquipStatistics(String bizOrgCode) {
+        return fireFightingSystemMapper.getStockEquipStatistics(bizOrgCode);
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ScrapServiceImpl.java

@@ -22,10 +22,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -128,6 +125,7 @@ public class ScrapServiceImpl extends ServiceImpl<ScrapMapper, Scrap> implements
             StockDetail stockDetail = new StockDetail();
             stockDetail.setId(x.getStockDetailId());
             stockDetail.setStatus("7");
+            stockDetail.setUpdateDate(new Date());
             stockDetailIds.add(stockDetail);
         });
         //修改库存状态

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -853,7 +853,7 @@ public class ExcelServiceImpl {
 			String relationship = firefightersContacts.getRelationship().split("@")[1];
 			firefightersContacts.setRelationship(relationship);
 		}
-		if (!ObjectUtils.isEmpty(item.getPeopleType()) && item.getPeopleType().contains("@") && "2".equals(item.getPeopleType().split("@")[1])) {
+		if (!ObjectUtils.isEmpty(item.getPeopleType()) && item.getPeopleType().contains("@") && "1601".equals(item.getPeopleType().split("@")[1])) {
 			// 保存消防队伍人员和紧急联系人
 			Firefighters firefighters = new Firefighters();
 			firefighters = Bean.toPo(item, firefighters);

amos-boot-system-equip/src/main/resources/mapper/AnalysisReportLogMapper.xml

@@ -127,6 +127,6 @@
 			</if>
 		</where>
 		ORDER BY
-		report_date_desc DESC
+		create_date DESC
 	</select>
 </mapper>

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -5042,4 +5042,130 @@
         WHERE
             equipment_specific_id = #{equipSpeId}
     </select>
+
+    <select id="getEquipExpiryStatistics" resultType="java.util.Map">
+        SELECT
+        a.equipSortName AS `name`,
+        count( 1 ) AS `value`
+        FROM
+        (
+        SELECT
+        es.id,
+        ed.`name`,
+        ed.standard,
+        DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ) AS passDate,
+        DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) AS dayNum,
+        DATE_FORMAT( ed.production_date, '%Y-%m-%d' ) AS productDate,
+        e.`name` AS equipSortName,
+        e.id AS equipSortId
+        FROM
+        wl_equipment_specific es
+        LEFT JOIN wl_equipment_detail ed ON ed.id = es.equipment_detail_id
+        LEFT JOIN wl_equipment e ON ed.equipment_id = e.id
+        LEFT JOIN wl_stock_detail sd ON sd.equipment_detail_id = ed.id
+        WHERE
+        ed.production_date IS NOT NULL
+        AND sd.`status` != 7
+        AND e.expiry_date IS NOT NULL
+        AND es.biz_org_code like concat(#{bizOrgCode}, '%')
+        AND DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) > 0
+        AND #{expiryDayNum} >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )
+        ) a
+        GROUP BY
+        a.equipSortId
+    </select>
+
+    <select id="getEquipExpiryListByPage" resultType="java.util.Map">
+        SELECT
+        es.id AS specificId,
+        ed.`name` AS specificName,
+        IFNULL( ed.standard, '' ) AS modelNumber,
+        DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ) AS passDate,
+        DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) AS dayNum,
+        DATE_FORMAT( ed.production_date, '%Y-%m-%d' ) AS productDate,
+        e.`name` AS equipSortName,
+        e.id AS equipSortId,
+        IFNULL( ws.full_name, '' ) AS equipAddress
+        FROM
+        wl_equipment_specific es
+        LEFT JOIN wl_equipment_detail ed ON ed.id = es.equipment_detail_id
+        LEFT JOIN wl_warehouse_structure ws ON ws.id = es.warehouse_structure_id
+        LEFT JOIN wl_equipment e ON ed.equipment_id = e.id
+        LEFT JOIN wl_stock_detail sd ON sd.equipment_detail_id = ed.id
+        WHERE
+        ed.production_date IS NOT NULL
+        AND sd.`status` != 7
+        AND e.expiry_date IS NOT NULL
+        AND es.biz_org_code like concat(#{bizOrgCode}, '%')
+        AND DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) > 0
+        AND #{expiryDayNum} >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )
+        ORDER BY DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) ASC
+    </select>
+
+    <select id="getStockEquipStatistics" resultType="java.util.Map">
+        SELECT
+        '本月已报废' AS `content`,
+        'upload/equipment_category_icon/byybf.png' AS image,
+        (
+        SELECT
+        count( 1 )
+        FROM
+        wl_stock_detail sd
+        LEFT JOIN wl_equipment_specific es ON es.id = sd.equipment_specific_id
+        WHERE
+        sd.`status` = 7
+        AND update_date LIKE CONCAT( DATE_FORMAT( CURRENT_DATE, '%Y-%m' ), '%' )
+        AND es.biz_org_code LIKE concat(#{bizOrgCode}, '%')
+        ) AS countNum UNION ALL
+        SELECT
+        '累计报废装备' AS `content`,
+        'upload/equipment_category_icon/ljbf.png' AS image,
+        (
+        SELECT
+        count( 1 )
+        FROM
+        wl_stock_detail sd
+        LEFT JOIN wl_equipment_specific es ON es.id = sd.equipment_specific_id
+        WHERE
+        sd.`status` = 7
+        AND es.biz_org_code LIKE concat(#{bizOrgCode}, '%')
+        ) AS countNum UNION ALL
+        SELECT
+        '超期未报废' AS `content`,
+        'upload/equipment_category_icon/cqwbf.png' AS image,
+        (
+        SELECT
+        count( es.id )
+        FROM
+        wl_equipment_specific es
+        LEFT JOIN wl_equipment_detail ed ON ed.id = es.equipment_detail_id
+        LEFT JOIN wl_equipment e ON ed.equipment_id = e.id
+        LEFT JOIN wl_stock_detail sd ON sd.equipment_detail_id = ed.id
+        WHERE
+        ed.production_date IS NOT NULL
+        AND sd.`status` != 7
+        AND e.expiry_date IS NOT NULL
+        AND es.biz_org_code LIKE concat(#{bizOrgCode}, '%')
+        AND 0 >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )
+        ) AS countNum UNION ALL
+        SELECT
+        '近2月临期设备' AS `content`,
+        'upload/equipment_category_icon/j2ylqsb.png' AS image,
+        (
+        SELECT
+        count( es.id )
+        FROM
+        wl_equipment_specific es
+        LEFT JOIN wl_equipment_detail ed ON ed.id = es.equipment_detail_id
+        LEFT JOIN wl_equipment e ON ed.equipment_id = e.id
+        LEFT JOIN wl_stock_detail sd ON sd.equipment_detail_id = ed.id
+        WHERE
+        ed.production_date IS NOT NULL
+        AND sd.`status` != 7
+        AND e.expiry_date IS NOT NULL
+        AND es.biz_org_code LIKE concat(#{bizOrgCode}, '%')
+        AND DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) > 0
+        AND 60 >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )
+        ) AS countNum
+    </select>
 </mapper>

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/entity/SubmitRecord.java

+package com.yeejoin.amos.boot.module.tdc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author xxz
+ */
+@Data
+@Accessors(chain = true)
+@TableName("tdc_submit_record")
+@ApiModel(value="SubmitRecord对象", description="提交记录")
+public class SubmitRecord {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
+    protected Long sequenceNbr;
+
+    @ApiModelProperty(value = "填报人")
+    private String submitPeople;
+
+    @ApiModelProperty(value = "机构code")
+    private String amosOrgCode;
+
+    @ApiModelProperty(value = "机构名称")
+    private String amosOrgName;
+
+    @ApiModelProperty(value = "填报时间")
+    private Date submitTime;
+
+    @ApiModelProperty(value = "校验批次号")
+    private String batchNo;
+}

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/mapper/SubmitRecordMapper.java

+package com.yeejoin.amos.boot.module.tdc.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.tdc.api.entity.SubmitRecord;
+import org.mapstruct.Mapper;
+
+/**
+ * @author DELL
+ */
+@Mapper
+public interface SubmitRecordMapper extends BaseMapper<SubmitRecord> {
+}

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/service/SubmitRecordService.java

+package com.yeejoin.amos.boot.module.tdc.api.service;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * @author xxz
+ */
+@Service
+public interface SubmitRecordService {
+}

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/resources/mapper/SubmitRecordMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!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.tdc.api.mapper.SubmitRecordMapper">
+</mapper>
\ No newline at end of file

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/controller/SubmitRecordController.java

+package com.yeejoin.amos.boot.module.tdc.biz.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.tdc.api.service.SubmitRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+/**
+ * 校验记录
+ * @author xxz
+ */
+@RestController
+@Api(tags = "校验项提交")
+@RequestMapping(value = "/check-record")
+public class SubmitRecordController {
+}
\ No newline at end of file

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/service/impl/SubmitRecordServiceImpl.java

+package com.yeejoin.amos.boot.module.tdc.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yeejoin.amos.boot.module.tdc.api.entity.SubmitRecord;
+import com.yeejoin.amos.boot.module.tdc.api.mapper.SubmitRecordMapper;
+import com.yeejoin.amos.boot.module.tdc.api.service.SubmitRecordService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @author DELL
+ */
+@Service
+public class SubmitRecordServiceImpl extends ServiceImpl<SubmitRecordMapper, SubmitRecord> implements SubmitRecordService {
+}