diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/AuditTask.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/AuditTask.java index a9266fc..f0bc39d 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/AuditTask.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/AuditTask.java @@ -20,6 +20,9 @@ public class AuditTask { private String taskId; @NotNull private String contUuid; + /** + * 00业主用户、01监理用户、02承包商、03分包商 + */ @NotNull private String userType; @NotNull diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml index 9bb838c..9fa44a2 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml @@ -534,6 +534,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pfp.create_time between #{params.beginTime} and #{params.endTime} + order by pfp.create_time desc diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml index 70a295b..80f332b 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml @@ -204,7 +204,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND ppi.pro_name like concat('%',#{proName},'%') - AND ppi.sup_name like concat('%',#{supName},'%') + AND ppi.sup_unit_name like concat('%',#{supName},'%') AND ppi.pro_id = #{proId} @@ -252,4 +252,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file +