elink-star
/
epmet-cloud-yifengdian
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

master
wxz 2 years ago
parent
35a36f1288 8f6e0421b5
commit
4922833a59
17 changed files with 87 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlacePatrolReviewRecordFormDTO.java
  2. 4
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlaceOrgFormDTO.java
  3. 15
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlaceOrgController.java
  4. 6
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlaceOrgDao.java
  5. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlaceOrgService.java
  6. 4
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java
  7. 33
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml
  8. 8
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingshanHelpCrowdSaveFormDTO.java
  9. 4
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/lingshan/LingshanHelpCrowdDetailRstDTO.java
  10. 4
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdCanjiExcelData.java
  11. 4
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDabingExcelData.java
  12. 6
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDibaoExcelData.java
  13. 4
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDujuExcelData.java
  14. 3
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdGaolingExcelData.java
  15. 4
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdKongchaoExcelData.java
  16. 6
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdLiushouExcelData.java
  17. 4
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdTekunExcelData.java

2
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlacePatrolReviewRecordFormDTO.java
View File

@ -73,13 +73,11 @@ public class EditPlacePatrolReviewRecordFormDTO implements Serializable {
/**
* 安全隐患类型
*/
@NotBlank(message = "安全隐患类型不能为空", groups = {EditPlacePatrolReviewRecordFormDTO.Edit.class})
private String dangerType;
/**
* 安全隐患名称
*/
@NotBlank(message = "安全隐患名称不能为空", groups = {EditPlacePatrolReviewRecordFormDTO.Edit.class})
private String dangerName;
public interface Edit { }

4
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlaceOrgFormDTO.java
View File

@ -56,5 +56,9 @@ public class GetListPlaceOrgFormDTO implements Serializable {
private String staffId;
//token中userId所属组织
private String agencyId;
//是否存在隐患 0 消除隐患 1 存在隐患 该参数可不传
private Integer danger;
//是否是重点企业
private Boolean securityFlag;
}

15
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlaceOrgController.java
View File

@ -133,15 +133,16 @@ public class IcPlaceOrgController {
}
/**
* @description 灵山大屏存在隐患获取企业信息
* @throws
* @author yan Lu
* @date 2023/5/30 17:21
*/
* @throws
* @description 灵山大屏存在隐患获取企业信息
* @author yan Lu
* @date 2023/5/30 17:21
*/
@GetMapping("getPlaceOrgByDanger")
public Result<List<PlaceOrgDetailResultDTO>> getPlaceOrgByDanger(@RequestParam("orgId") String orgId,
@RequestParam("orgType") String orgType){
return new Result().ok(placeOrgService.getPlaceOrgByDanger(orgId, orgType));
@RequestParam("orgType") String orgType,
@RequestParam("danger") Integer danger) {
return new Result().ok(placeOrgService.getPlaceOrgByDanger(orgId, orgType, danger));
}
}

6
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlaceOrgDao.java
View File

@ -43,9 +43,9 @@ public interface IcPlaceOrgDao extends BaseDao<IcPlaceOrgEntity> {
**/
List<PlaceOrgDetailResultDTO> getList(GetListPlaceOrgFormDTO formDTO);
List<PlaceOrgByTypeResultDTO> getPlaceOrgByType(@Param("orgId")String orgId,@Param("orgType")String orgType);
List<PlaceOrgByTypeResultDTO> getPlaceOrgByType(@Param("orgId") String orgId, @Param("orgType") String orgType);
IcPlaceOrgStatistics countPlaceOrgByDangerType(@Param("orgId")String orgId,@Param("orgType")String orgType);
IcPlaceOrgStatistics countPlaceOrgByDangerType(@Param("orgId") String orgId, @Param("orgType") String orgType);
List<PlaceOrgDetailResultDTO> getPlaceOrgByDanger(@Param("orgId")String orgId,@Param("orgType")String orgType);
List<PlaceOrgDetailResultDTO> getPlaceOrgByDanger(@Param("orgId") String orgId, @Param("orgType") String orgType, @Param("danger") Integer danger);
}

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlaceOrgService.java
View File

@ -71,5 +71,5 @@ public interface IcPlaceOrgService extends BaseService<IcPlaceOrgEntity> {
IcPlaceOrgStatistics countPlaceOrgByDangerType(String orgId, String orgType);
List<PlaceOrgDetailResultDTO> getPlaceOrgByDanger(String orgId, String orgType);
List<PlaceOrgDetailResultDTO> getPlaceOrgByDanger(String orgId, String orgType, Integer danger);
}

4
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java
View File

@ -216,8 +216,8 @@ public class IcPlaceOrgServiceImpl extends BaseServiceImpl<IcPlaceOrgDao, IcPlac
}
@Override
public List<PlaceOrgDetailResultDTO> getPlaceOrgByDanger(String orgId, String orgType) {
return baseDao.getPlaceOrgByDanger(orgId, orgType);
public List<PlaceOrgDetailResultDTO> getPlaceOrgByDanger(String orgId, String orgType, Integer danger) {
return baseDao.getPlaceOrgByDanger(orgId, orgType, danger);
}
}

33
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml
View File

@ -26,6 +26,9 @@
FROM
ic_place_org a
LEFT JOIN customer_grid b ON a.GRID_ID = b.ID
<if test="null != danger">
LEFT JOIN ic_place_patrol_record ppr ON ppr.PLACE_ORG_ID = a.ID
</if>
WHERE
a.del_flag = '0'
<if test="placeOrgId != null and placeOrgId.trim() != ''">
@ -52,6 +55,17 @@
<if test="scale != null and scale.trim() != ''">
AND a.scale = #{scale}
</if>
<if test="securityFlag != null and securityFlag == true">
AND a.SECURITY_FLAG = #{securityFlag}
</if>
<if test="null != danger">
<if test="danger == 1">
AND ppr.FIRST_RESULT = 1
</if>
<if test="danger == 0">
AND ppr.FINAL_RESULT = 0
</if>
</if>
ORDER BY a.created_time DESC
</select>
@ -101,8 +115,8 @@
(
SELECT
count(r.id) as ridCount,
sum(case when r.FIRST_RESULT = 1 then 1 else 0 end) as dangerCount,
sum(case when r.FINAL_RESULT = 0 then 1 else 0 end) as removeCount
sum(case when r.FINAL_RESULT = 1 then 1 else 0 end) as dangerCount,
sum(case when (r.FINAL_RESULT = 0 and r.FINAL_RESULT = 0) then 1 else 0 end) as removeCount
FROM
ic_place_patrol_record r
<where>
@ -150,9 +164,15 @@
AND p.id IN (
SELECT r.PLACE_ORG_ID FROM ic_place_patrol_record r
<where>
r.FINAL_RESULT = 1 and r.DEL_FLAG = 0
r.DEL_FLAG = 0
<if test="null != danger and danger == 0">
AND r.FINAL_RESULT = 0
</if>
<if test="null != danger and danger == 1">
AND r.FIRST_RESULT = 1
</if>
<if test="null != orgType and orgType !=''">
<if test="null != orgId and orgId != '' and orgType == 'agancy'">
<if test="null != orgId and orgId != '' and orgType == 'agency'">
AND r.agency_id = #{orgId}
</if>
<if test="null != orgId and orgId != '' and orgType == 'grid'">
@ -160,9 +180,10 @@
</if>
</if>
</where>
GROUP BY r.PLACE_ORG_ID
)
<if test="null != orgType and orgType !=''">
<if test="null != orgId and orgId != '' and orgType == 'agancy'">
<if test="null != orgId and orgId != '' and orgType == 'agency'">
AND p.agency_id = #{orgId}
</if>
<if test="null != orgId and orgId != '' and orgType == 'grid'">
@ -170,7 +191,7 @@
</if>
</if>
</where>
GROUP BY p.id
</select>

8
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingshanHelpCrowdSaveFormDTO.java
View File

@ -139,8 +139,8 @@ public class LingshanHelpCrowdSaveFormDTO {
/**
* 最初享受月份
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM")
@DateTimeFormat(pattern = "yyyy-MM")
private Date zcxsyf;
/**
@ -381,8 +381,8 @@ public class LingshanHelpCrowdSaveFormDTO {
/**
* 最初享受月份
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM")
@DateTimeFormat(pattern = "yyyy-MM")
private Date zcxsyf;
/**

4
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/lingshan/LingshanHelpCrowdDetailRstDTO.java
View File

@ -143,7 +143,7 @@ public class LingshanHelpCrowdDetailRstDTO {
/**
* 最初享受月份
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM")
private Date zcxsyf;
/**
@ -384,7 +384,7 @@ public class LingshanHelpCrowdDetailRstDTO {
/**
* 最初享受月份
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM")
private Date zcxsyf;
/**

4
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdCanjiExcelData.java
View File

@ -9,6 +9,7 @@ import com.epmet.excel.converter.LingShanSpecialCrowdYesOrNoConverter;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import java.util.Date;
/**
@ -24,18 +25,21 @@ public class LingshanHelpCrowdCanjiExcelData extends LingShanHelpCrowdBaseExcelD
* 残疾证号
*/
@ExcelProperty(value = "*残疾证号")
@NotBlank(message = "残疾证号必填")
private String cjzh;
/**
* 残疾类别，字典
*/
@ExcelProperty(value = "*残疾类型", converter = LingShanHelpCrowdExcelConverter.class)
@NotBlank(message = "残疾类型必填")
private String cjlb;
/**
* 残疾登记（状况） 字典
*/
@ExcelProperty(value = "*残疾等级", converter = LingShanHelpCrowdExcelConverter.class)
@NotBlank(message = "残疾等级必填")
private String cjzk;
/**

4
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDabingExcelData.java
View File

@ -6,6 +6,8 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
@ -21,12 +23,14 @@ public class LingshanHelpCrowdDabingExcelData extends LingShanHelpCrowdBaseExcel
* 所患病种（大病）
*/
@ExcelProperty(value = "*患病病种")
@NotBlank(message = "患病病种必填")
private String shbz;
/**
* 患病时间
*/
@ExcelProperty(value = "*患病时间")
@NotNull(message = "患病时间必填")
private Date hbsj;
/**

6
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDibaoExcelData.java
View File

@ -1,6 +1,7 @@
package com.epmet.excel.data;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.TableName;
import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter;
@ -8,6 +9,8 @@ import com.epmet.excel.converter.LingShanSpecialCrowdYesOrNoConverter;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
@ -30,12 +33,14 @@ public class LingshanHelpCrowdDibaoExcelData extends LingShanHelpCrowdBaseExcelD
* 低保类型。200农村低保，201城镇低保
*/
@ExcelProperty(value = "*低保类型", converter = LingShanHelpCrowdExcelConverter.class)
@NotNull(message = "低保类型必填")
private Integer dblx;
/**
* 低保（特困）证号
*/
@ExcelProperty(value = "*低保（特困）证号")
@NotBlank(message = "低保（特困）证号必填")
private String dbzh;
/**
@ -90,6 +95,7 @@ public class LingshanHelpCrowdDibaoExcelData extends LingShanHelpCrowdBaseExcelD
* 最初享受月份
*/
@ExcelProperty(value = "最初享受月份")
@DateTimeFormat("yyyy-MM")
private Date zcxsyf;
/**

4
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDujuExcelData.java
View File

@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* 重点帮扶-独居老人
*
@ -17,12 +19,14 @@ public class LingshanHelpCrowdDujuExcelData extends LingShanHelpCrowdBaseExcelDa
* 监护人姓名
*/
@ExcelProperty(value = "*监护人姓名")
@NotBlank(message = "监护人姓名必填")
private String jhrxm;
/**
* 监护人电话
*/
@ExcelProperty(value = "*监护人电话")
@NotBlank(message = "监护人电话必填")
private String jhrdh;
/**

3
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdGaolingExcelData.java
View File

@ -7,6 +7,8 @@ import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
/**
@ -28,6 +30,7 @@ public class LingshanHelpCrowdGaolingExcelData extends LingShanHelpCrowdBaseExce
* 津贴金额（元）
*/
@ExcelProperty(value = "*津贴金额（元）")
@NotNull(message = "津贴金额（元）必填")
private BigDecimal jtje;
/**

4
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdKongchaoExcelData.java
View File

@ -7,6 +7,8 @@ import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
/**
* 重点帮扶-独居老人
*
@ -20,12 +22,14 @@ public class LingshanHelpCrowdKongchaoExcelData extends LingShanHelpCrowdBaseExc
* 监护人姓名
*/
@ExcelProperty(value = "*监护人姓名")
@NotBlank(message = "监护人姓名必填")
private String jhrxm;
/**
* 监护人电话
*/
@ExcelProperty(value = "*监护人电话")
@NotBlank(message = "监护人电话必填")
private String jhrdh;
/**

6
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdLiushouExcelData.java
View File

@ -6,6 +6,8 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
/**
* 重点帮扶-留守儿童
*
@ -19,24 +21,28 @@ public class LingshanHelpCrowdLiushouExcelData extends LingShanHelpCrowdBaseExce
* 监护人姓名
*/
@ExcelProperty(value = "*监护人姓名")
@NotBlank(message = "监护人姓名必填")
private String jhrxm;
/**
* 监护人电话
*/
@ExcelProperty(value = "*监护人电话")
@NotBlank(message = "监护人电话必填")
private String jhrdh;
/**
* 与监护人关系
*/
@ExcelProperty(value = "*与监护人关系")
@NotBlank(message = "与监护人关系必填")
private String yjhrgx;
/**
* 所在学校及班级
*/
@ExcelProperty(value = "*所在学校及班级")
@NotBlank(message = "所在学校及班级必填")
private String szxxjbj;
/**

4
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdTekunExcelData.java
View File

@ -1,6 +1,7 @@
package com.epmet.excel.data;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.TableName;
import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter;
@ -8,6 +9,7 @@ import com.epmet.excel.converter.LingShanSpecialCrowdYesOrNoConverter;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;
import java.util.Date;
@ -30,6 +32,7 @@ public class LingshanHelpCrowdTekunExcelData extends LingShanHelpCrowdBaseExcelD
* 低保（特困）证号
*/
@ExcelProperty(value = "*低保（特困）证号")
@NotBlank(message = "低保（特困）证号必填")
private String dbzh;
/**
@ -84,6 +87,7 @@ public class LingshanHelpCrowdTekunExcelData extends LingShanHelpCrowdBaseExcelD
* 最初享受月份
*/
@ExcelProperty(value = "最初享受月份")
@DateTimeFormat("yyyy-MM")
private Date zcxsyf;
/**

Write Preview
Loading…
Cancel
Save