增加查询条件

heheng

15 hours ago a3d63a4a7199d346e63039a8fd6490b12387fa4e

增加查询条件

 multi-system/src/main/java/com/gkhy/exam/system/domain/ContractLedger.java

@@ -61,5 +61,8 @@
    @TableField("update_time")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "年份")
    @TableField(exist = false)
    private String year;

}

 multi-system/src/main/java/com/gkhy/exam/system/domain/ContractReview.java

@@ -144,4 +144,7 @@
    @TableField(exist = false)
    private List<ContractReviewMess> reviewMesses;

    @ApiModelProperty(value = "年份")
    @TableField(exist = false)
    private String year;
}

 multi-system/src/main/java/com/gkhy/exam/system/domain/CustomerCommunication.java

@@ -133,4 +133,8 @@
    @TableField("update_time")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "年份")
    @TableField(exist = false)
    private String year;

}

 multi-system/src/main/java/com/gkhy/exam/system/domain/CustomerRecord.java

@@ -49,6 +49,9 @@

    @TableField(exist = false)
    private List<CustomerRecordNeed> customerRecordNeeds;
    @ApiModelProperty(value = "年份")
    @TableField("year")
    private String year;


}

 multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentBorrowCopy.java

@@ -82,6 +82,10 @@
    @TableField("version")
    private Integer version;

    @ApiModelProperty(value = "年份")
    @TableField("year")
    private String year;

    @TableField(exist = false)
    @ApiModelProperty("文件借阅复制申请容表")
    private List<DocumentBorrowCopyRecord> documentBorrowCopyRecordList;

 multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentChangesInvalidated.java

@@ -178,6 +178,10 @@
    @TableField("version")
    private Integer version;

    @ApiModelProperty(value = "年份")
    @TableField("year")
    private String year;

    @ApiModelProperty("发放表")
    @TableField(exist = false)
    private List<DocumentChangesInvalidatedIssue> documentChangesInvalidatedIssueList;

 multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentDestructionApply.java

@@ -131,6 +131,10 @@
    @TableField("create_by")
    private String createBy;

    @ApiModelProperty(value = "年份")
    @TableField("year")
    private String year;

    @ApiModelProperty("更新时间")
    @TableField("update_time")
    private LocalDateTime updateTime;

 multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentDistributionCollection.java

@@ -82,6 +82,9 @@
    @TableField("version")
    private Integer version;

    @ApiModelProperty(value = "年份")
    @TableField("year")
    private String year;

    @TableField(exist = false)
    @ApiModelProperty("文件发放回收内容表")

 multi-system/src/main/java/com/gkhy/exam/system/domain/Item.java

@@ -42,6 +42,10 @@
    @TableField("update_by")
    private String updateBy;

    @ApiModelProperty(value = "年份")
    @TableField("year")
    private String year;

    @TableField("update_time")
    private LocalDateTime updateTime;


 multi-system/src/main/java/com/gkhy/exam/system/domain/PostSales.java

@@ -104,5 +104,8 @@
    @TableField("update_time")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "年份")
    @TableField(exist = false)
    private String year;

}

 multi-system/src/main/java/com/gkhy/exam/system/domain/ProjectDelivery.java

@@ -87,6 +87,10 @@
    @TableField("update_time")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "年份")
    @TableField("year")
    private String year;





 multi-system/src/main/java/com/gkhy/exam/system/domain/ProjectResearch.java

@@ -87,7 +87,8 @@
    @TableField("update_time")
    private LocalDateTime updateTime;



    @ApiModelProperty(value = "年份")
    @TableField("year")
    private String year;

}

 multi-system/src/main/java/com/gkhy/exam/system/domain/SysNotice.java

@@ -78,6 +78,11 @@
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "年份")
    @TableField(exist = false)
    private String year;


    @ApiModelProperty("删除标志（0代表存在 1代表删除）")
    private Integer delFlag;
}

 multi-system/src/main/resources/mapper/system/ContractLedgerMapper.xml

@@ -24,6 +24,9 @@
            <if test="companyId!=null">
                and cl.company_id = #{companyId}
            </if>
        <if test="year != null and year != ''">
            AND DATE_FORMAT(cl.sign_date, '%Y') = #{year}
        </if>
        ORDER BY
            cl.create_time DESC
    </select>

 multi-system/src/main/resources/mapper/system/ContractReviewMapper.xml

@@ -55,6 +55,9 @@
        <if test="type!=null">
            and cr.type = #{type}
        </if>
        <if test="year != null and year != ''">
            AND DATE_FORMAT(cr.record_time, '%Y') = #{year}
        </if>
        ORDER BY
            cr.create_time DESC
    </select>

 multi-system/src/main/resources/mapper/system/CustomerCommunicationMapper.xml

@@ -44,6 +44,9 @@
        <if test="companyId!=null">
            and cc.company_id = #{companyId}
        </if>
        <if test="year != null and year != ''">
            AND DATE_FORMAT(cc.com_time, '%Y') = #{year}
        </if>
        ORDER BY
            cc.create_time DESC
    </select>

 multi-system/src/main/resources/mapper/system/CustomerRecordMapper.xml

@@ -21,6 +21,9 @@
            <if test="companyId!=null">
                and cr.company_id = #{companyId}
            </if>
        <if test="year!=null">
            and cr.year = #{year}
        </if>
        ORDER BY
            cr.create_time DESC
    </select>

 multi-system/src/main/resources/mapper/system/DocumentBorrowCopyMapper.xml

@@ -9,6 +9,9 @@
        <if test="companyId!=null ">
            and company_id = #{companyId}
        </if>
        <if test="year!=null and year != '' ">
            and year = #{year}
        </if>
        order by create_time desc
    </select>
</mapper>

 multi-system/src/main/resources/mapper/system/DocumentChangesInvalidatedMapper.xml

@@ -9,6 +9,9 @@
        <if test="companyId!=null ">
            and company_id = #{companyId}
        </if>
        <if test="year!=null and year != '' ">
            and year = #{year}
        </if>
        order by create_time desc
    </select>
</mapper>

 multi-system/src/main/resources/mapper/system/DocumentDestructionApplyMapper.xml

@@ -9,6 +9,9 @@
        <if test="companyId!=null ">
            and company_id = #{companyId}
        </if>
        <if test="year!=null and year != '' ">
            and year = #{year}
        </if>
        ORDER BY create_time desc
    </select>
</mapper>

 multi-system/src/main/resources/mapper/system/DocumentDistributionCollectionMapper.xml

@@ -9,6 +9,10 @@
        <if test="companyId!=null ">
            and company_id = #{companyId}
        </if>
        <if test="year!=null and year != '' ">
            and year = #{year}
        </if>

        order by create_time desc
    </select>
</mapper>

 multi-system/src/main/resources/mapper/system/ItemMapper.xml

@@ -23,13 +23,18 @@
            `create_by`,
            `create_time`,
            `update_by`,
            `update_time`
            `update_time`,
            `year`
        FROM
            `item`
        where del_flag = 1
        <if test="companyId!=null">
            and company_id = #{companyId}
        </if>
        <if test="year != null and year != ''">
            and year = #{year}
        </if>

    </select>
    <select id="selectItemListAll" resultType="com.gkhy.exam.system.domain.Item">
        SELECT
@@ -40,7 +45,8 @@
            i.`create_by`,
            i.`create_time`,
            i.`update_by`,
            i.`update_time`
            i.`update_time`,
            i.`year`
        FROM
            `item` i
            LEFT JOIN item_user iu ON i.id = iu.item_id
@@ -52,6 +58,9 @@
            <if test="userId!=null">
                and iu.user_id = #{userId}
            </if>
        <if test="year != null and year != ''">
            and i.year = #{year}
        </if>
        GROUP BY
            i.id


 multi-system/src/main/resources/mapper/system/PostSalesMapper.xml

@@ -36,6 +36,9 @@
        <if test="companyId!=null">
            and ps.company_id = #{companyId}
        </if>
        <if test="year != null and year != ''">
            AND DATE_FORMAT(ps.server_time, '%Y') = #{year}
        </if>
        ORDER BY
            ps.create_time DESC
    </select>

 multi-system/src/main/resources/mapper/system/ProjectDeliveryMapper.xml

@@ -23,7 +23,8 @@
            pd.`create_by`,
            pd.`create_time`,
            pd.`update_by`,
            pd.`update_time`
            pd.`update_time`,
        pd.`year`
        FROM
            `project_delivery` pd
        LEFT JOIN sys_company sc ON pd.company_id = sc.id
@@ -32,6 +33,9 @@
          <if test="companyId!=null">
              AND pd.company_id = #{companyId}
          </if>
        <if test="year!=null and year != ''">
            AND pd.year = #{year}
        </if>
        ORDER BY
            pd.create_time DESC
    </select>

 multi-system/src/main/resources/mapper/system/ProjectResearchMapper.xml

@@ -31,6 +31,9 @@
            <if test="companyId!=null">
                and pr.company_id = #{companyId}
            </if>
        <if test="year!=null and year != ''">
            AND pr.year = #{year}
        </if>
        ORDER BY
            pr.create_time DESC
    </select>

 multi-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -56,6 +56,9 @@
        <if test="createBy != null and createBy != ''">
            AND a.create_by like concat('%', #{createBy}, '%')
        </if>
        <if test="year != null and year != ''">
            AND DATE_FORMAT(a.publish_date, '%Y') = #{year}
        </if>

        order by a.create_time desc
    </select>