suzhou-jichuang-lanhai
/
JinJiHuJava
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
dongdingding
杜函宇 11 months ago
parent 7a2183de5a
commit 111305426d
17 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsDeclarationRecords.java
Unescape View File

@ -103,7 +103,7 @@ public class BmsDeclarationRecords extends BaseInfoEntity {
*/ */
@JSONField(serialize = false) @JSONField(serialize = false)
@ApiModelProperty(value = "审批状态") @ApiModelProperty(value = "审批状态")
@Excel(name = "审批状态", readConverterExp = "0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") @Excel(name = "审批状态", readConverterExp = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
/** /**

4
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProcessInfo.java
Unescape View File

@ -33,9 +33,9 @@ public class BmsProcessInfo extends BaseInfoEntity {
private Integer approvalType; private Integer approvalType;
/** /**
* 对应审批层级(0=初审,1=复审,2=上级评审) * 对应审批层级(0=初审,1=复审,2=终审)
*/ */
@Excel(name = "对应审批层级(0=初审,1=复审,2=上级评审)") @Excel(name = "对应审批层级(0=初审,1=复审,2=终审)")
private Integer approvalLevel; private Integer approvalLevel;
@Excel(name = "审批部门id") @Excel(name = "审批部门id")

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardUpdateDto.java
Unescape View File

@ -33,6 +33,6 @@ public class BmsBigStrongAwardUpdateDto extends BmsBigStrongAward implements Ser
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardUpdateDto.java
Unescape View File

@ -26,6 +26,6 @@ public class BmsBrandingAwardUpdateDto extends BmsBrandingAward {
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardUpdateDto.java
Unescape View File

@ -23,7 +23,7 @@ public class BmsCarrierConstructionAwardUpdateDto extends BmsCarrierConstruction
@Excel(name = "项目id") @Excel(name = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementUpdateDto.java
Unescape View File

@ -26,7 +26,7 @@ public class BmsCreditManagementUpdateDto extends BmsCreditManagement {
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

4
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java
Unescape View File

@ -49,8 +49,8 @@ public class BmsDeclarationRecordsDto extends BmsDeclarationRecords {
@ApiModelProperty(value = "模板名称") @ApiModelProperty(value = "模板名称")
private String templateName; private String templateName;
@ApiModelProperty(value = "0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") @ApiModelProperty(value = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
@Excel(name = "审批状态",readConverterExp = "0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") @Excel(name = "审批状态",readConverterExp = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private List<Long> statusStr; private List<Long> statusStr;
@ApiModelProperty(value = "0=未填报,1=已填报") @ApiModelProperty(value = "0=未填报,1=已填报")

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardUpdateDto.java
Unescape View File

@ -27,7 +27,7 @@ public class BmsIndustrialInternetAwardUpdateDto extends BmsIndustrialInternetAw
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesUpdateDto.java
Unescape View File

@ -26,7 +26,7 @@ public class BmsIntegrationIndustriesUpdateDto extends BmsIntegrationIndustries
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardUpdateDto.java
Unescape View File

@ -25,7 +25,7 @@ public class BmsLogisticsDevelopmentAwardUpdateDto extends BmsLogisticsDevelopme
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardUpdateDto.java
Unescape View File

@ -26,6 +26,6 @@ public class BmsManufacturingServicesAwardUpdateDto extends BmsManufacturingServ
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardUpdateDto.java
Unescape View File

@ -26,6 +26,6 @@ public class BmsPlatformConstructionAwardUpdateDto extends BmsPlatformConstructi
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardUpdateDto.java
Unescape View File

@ -33,7 +33,7 @@ public class BmsProjectSettlementAwardUpdateDto extends BmsProjectSettlementAwar
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")
private Long projectId; private Long projectId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardUpdateDto.java
Unescape View File

@ -20,7 +20,7 @@ public class BmsSceneOpeningAwardUpdateDto extends BmsSceneOpeningAward {
@ApiModelProperty(value = "记录id") @ApiModelProperty(value = "记录id")
private Long declarationRecordsId; private Long declarationRecordsId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
private Long status; private Long status;
@ApiModelProperty(value = "项目id") @ApiModelProperty(value = "项目id")

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java
Unescape View File

@ -92,7 +92,7 @@ public class BmsDeclarationRecordsQueryVo implements Serializable {
private Long detailId; private Long detailId;
@ApiModelProperty(value = "审批状态") @ApiModelProperty(value = "审批状态")
@Excel(name = "审批状态", readConverterExp = "0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改") @Excel(name = "审批状态", readConverterExp = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审驳回,9=终审不通过，10=退回修改")
private Long status; private Long status;
} }

4
ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml
Unescape View File

@ -114,7 +114,7 @@
</if> </if>
<if test="isDeleted != null ">and a.is_deleted = #{isDeleted}</if> <if test="isDeleted != null ">and a.is_deleted = #{isDeleted}</if>
</where> </where>
order by a.create_time desc, e.dict_sort desc order by FIELD(a.status, 0, 1, 2, 3,10,8,7,9,5) , a.create_time desc, e.dict_sort desc
</select> </select>
<select id="selectBmsDeclarationRecordsById" parameterType="Long" resultMap="BmsDeclarationRecordsResult"> <select id="selectBmsDeclarationRecordsById" parameterType="Long" resultMap="BmsDeclarationRecordsResult">
@ -178,7 +178,7 @@
</foreach> </foreach>
</if> </if>
</where> </where>
ORDER BY ORDER BY FIELD(a.status, 0, 1, 2, 3,10,8,7,9,5),
d.approval_time DESC,a.create_time desc d.approval_time DESC,a.create_time desc
</select> </select>
<select id="selectBmsDeclarationRecordsZwList" <select id="selectBmsDeclarationRecordsZwList"

1
ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml
Unescape View File

@ -54,6 +54,7 @@
<if test="notes != null and notes != ''">and notes = #{notes}</if> <if test="notes != null and notes != ''">and notes = #{notes}</if>
<if test="status != null and status != ''">and status = #{status}</if> <if test="status != null and status != ''">and status = #{status}</if>
</where> </where>
order by create_time desc
</select> </select>
<select id="selectBmsTemplateRecordById" parameterType="Long" resultMap="BmsTemplateRecordResult"> <select id="selectBmsTemplateRecordById" parameterType="Long" resultMap="BmsTemplateRecordResult">

Write Preview
Loading…
Cancel
Save