fix: 80419 企标复审流程--选择企标--查询未生效

laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java

@@ -114,6 +114,12 @@ public class ESQueryCommonDTO {
     @ApiModelProperty(value = "复审计划-复审结束日期")
     private Date recheckEndDate;
 
+    @ApiModelProperty(value = "复审计划-主起草人")
+    private String mainDraftingUser;
+
+    @ApiModelProperty(value = "复审计划-主起草单位")
+    private String mainDraftingUnit;
+
     public void transIdsToList() {
         if (StrUtil.isBlank(this.selections)) {
             return;

laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml

@@ -38,6 +38,8 @@
         FROM
             laws_enterprise_standard_recheck_plan AS p
                 LEFT JOIN laws_enterprise_standard AS s ON s.id = p.standard_id
+                LEFT JOIN sys_user AS u ON u.id = s.main_drafting_user
+                LEFT JOIN sys_depart AS d ON d.id = s.main_drafting_unit
         WHERE 1 = 1
             <!--企标编号判断-->
             <if test="param.standardNo != null and param.standardNo != ''">
@@ -61,6 +63,14 @@
                     #{item}
                 </foreach>
             </if>
+            <!--主起草人-->
+            <if test="param.mainDraftingUser != null and param.mainDraftingUser != ''">
+                AND CONCAT(u.realname, '(', u.username, ')') LIKE CONCAT('%',#{param.mainDraftingUser},'%')
+            </if>
+            <!--主起草单位-->
+            <if test="param.mainDraftingUnit != null and param.mainDraftingUnit != ''">
+                AND s.main_drafting_unit = #{param.mainDraftingUnit}
+            </if>
         ORDER BY
             p.create_time DESC
     </select>