二保批量打印接口

lyh

9 天以前 b84987e8d9def03bdf06f69e51de56e72d5b8131

二保批量打印接口

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamSecondMaintenanceOrderExport.java

@@ -153,6 +153,11 @@
    //型号
    @TableField(exist = false)
    private String equipmentModel;
    //保养日期
    private String maintenanceDateFormatted;
    //使用单位
    private String factoryName;


    //维修人员保养内容
    @DictList

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrderDetail.java

@@ -33,6 +33,7 @@
    /**创建人*/
    @Excel(name = "创建人", width = 15)
    @ApiModelProperty(value = "创建人")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String createBy;
    /**创建时间*/
    @ApiModelProperty(value = "创建时间")

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSecondMaintenanceOrderMapper.xml

@@ -11,10 +11,11 @@
        ${ew.customSqlSegment}
    </select>
    <select id="queryList" resultType="org.jeecg.modules.eam.dto.EamSecondMaintenanceOrderExport">
        select wmo.*, e.equipment_code, e.equipment_name,e.equipment_model
        select wmo.*,FORMAT(wmo.maintenance_date, 'yyyy年MM月dd日') AS maintenance_date_formatted, e.equipment_code, e.equipment_name,e.equipment_model,f.factory_name
        from eam_second_maintenance_order wmo
        inner join eam_equipment e
        on wmo.equipment_id = e.id
        ${ew.customSqlSegment}
        LEFT JOIN eam_base_factory f ON f.org_code = SUBSTRING ( e.factory_org_code , 1, 6 )
            ${ew.customSqlSegment}
    </select>
</mapper>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java

@@ -678,6 +678,7 @@
    public List<EamSecondMaintenanceOrderExport> export(String ids){
        QueryWrapper<EamSecondMaintenanceOrderExport> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("wmo.del_flag",CommonConstant.DEL_FLAG_0.toString());
        queryWrapper.eq("wmo.maintenance_status",SecondMaintenanceStatusEnum.COMPLETE.name());
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {