update

Lius

2024-10-21 316ef1bf39d16a29c27fe26393e704c1d0b963f9

update

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcComponentInfoController.java

ÎļþÃû´Ó lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/ComponentInfoController.java ÐÞ¸Ä
@@ -10,8 +10,8 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.mdc.entity.ComponentInfo;
import org.jeecg.modules.mdc.service.IComponentInfoService;
import org.jeecg.modules.mdc.entity.MdcComponentInfo;
import org.jeecg.modules.mdc.service.IMdcComponentInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -24,21 +24,21 @@
/**
 * @Description: é›¶ä»¶è¡¨
 * @Author: lius
 * @Date: 2024-10-18
 * @Date: 2024-10-21
 * @Version: V1.0
 */
@Slf4j
@Api(tags = "零件表")
@RestController
@RequestMapping("/mdc/componentInfo")
public class ComponentInfoController extends JeecgController<ComponentInfo, IComponentInfoService> {
@RequestMapping("/mdc/mdcComponentInfo")
public class MdcComponentInfoController extends JeecgController<MdcComponentInfo, IMdcComponentInfoService> {
    @Resource
    private IComponentInfoService componentInfoService;
    private IMdcComponentInfoService mdcComponentInfoService;

    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param componentInfo
     * @param mdcComponentInfo
     * @param pageNo
     * @param pageSize
     * @param req
@@ -47,41 +47,41 @@
    @AutoLog(value = "零件表-分页列表查询")
    @ApiOperation(value = "零件表-分页列表查询", notes = "零件表-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(ComponentInfo componentInfo,
    public Result<?> queryPageList(MdcComponentInfo mdcComponentInfo,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<ComponentInfo> queryWrapper = QueryGenerator.initQueryWrapper(componentInfo, req.getParameterMap());
        Page<ComponentInfo> page = new Page<ComponentInfo>(pageNo, pageSize);
        IPage<ComponentInfo> pageList = componentInfoService.page(page, queryWrapper);
        QueryWrapper<MdcComponentInfo> queryWrapper = QueryGenerator.initQueryWrapper(mdcComponentInfo, req.getParameterMap());
        Page<MdcComponentInfo> page = new Page<MdcComponentInfo>(pageNo, pageSize);
        IPage<MdcComponentInfo> pageList = mdcComponentInfoService.page(page);
        return Result.OK(pageList);
    }

    /**
     * æ·»åŠ 
     *
     * @param componentInfo
     * @param mdcComponentInfo
     * @return
     */
    @AutoLog(value = "零件表-添加")
    @ApiOperation(value = "零件表-添加", notes = "零件表-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody ComponentInfo componentInfo) {
        componentInfoService.save(componentInfo);
    public Result<?> add(@RequestBody MdcComponentInfo mdcComponentInfo) {
        mdcComponentInfoService.save(mdcComponentInfo);
        return Result.OK("添加成功！");
    }

    /**
     * ç¼–辑
     *
     * @param componentInfo
     * @param mdcComponentInfo
     * @return
     */
    @AutoLog(value = "零件表-编辑")
    @ApiOperation(value = "零件表-编辑", notes = "零件表-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody ComponentInfo componentInfo) {
        componentInfoService.updateById(componentInfo);
    public Result<?> edit(@RequestBody MdcComponentInfo mdcComponentInfo) {
        mdcComponentInfoService.updateById(mdcComponentInfo);
        return Result.OK("编辑成功!");
    }

@@ -95,7 +95,7 @@
    @ApiOperation(value = "零件表-通过id删除", notes = "零件表-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
        componentInfoService.removeById(id);
        mdcComponentInfoService.removeById(id);
        return Result.OK("删除成功!");
    }

@@ -109,7 +109,7 @@
    @ApiOperation(value = "零件表-批量删除", notes = "零件表-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.componentInfoService.removeByIds(Arrays.asList(ids.split(",")));
        this.mdcComponentInfoService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功！");
    }

@@ -123,19 +123,19 @@
    @ApiOperation(value = "零件表-通过id查询", notes = "零件表-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        ComponentInfo componentInfo = componentInfoService.getById(id);
        return Result.OK(componentInfo);
        MdcComponentInfo mdcComponentInfo = mdcComponentInfoService.getById(id);
        return Result.OK(mdcComponentInfo);
    }

    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param componentInfo
     * @param mdcComponentInfo
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, ComponentInfo componentInfo) {
        return super.exportXls(request, componentInfo, ComponentInfo.class, "零件表");
    public ModelAndView exportXls(HttpServletRequest request, MdcComponentInfo mdcComponentInfo) {
        return super.exportXls(request, mdcComponentInfo, MdcComponentInfo.class, "零件表");
    }

    /**
@@ -147,7 +147,7 @@
     */
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, ComponentInfo.class);
        return super.importExcel(request, response, MdcComponentInfo.class);
    }

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/ComponentInfo.java

ÎļþÒÑɾ³ý

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcComponentInfo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,90 @@
package org.jeecg.modules.mdc.entity;


import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;

import java.io.Serializable;

/**
 * @Description: é›¶ä»¶è¡¨
 * @Author: lius
 * @Date: 2024-10-21
 * @Version: V1.0
 */
@Data
@TableName("mdc_component_info")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "mdc_component_info对象", description = "零件表")
public class MdcComponentInfo extends JeecgEntity implements Serializable {

    private static final long serialVersionUID = 3989002838907751149L;

    /**
     * é›¶ä»¶å·
     */
    @Excel(name = "零件号", width = 15)
    @ApiModelProperty(value = "零件号")
    private String componentNo;
    /**
     * é›¶ä»¶åç§°
     */
    @Excel(name = "零件名称", width = 15)
    @ApiModelProperty(value = "零件名称")
    private String componentName;
    /**
     * ç­äº§èƒ½
     */
    @Excel(name = "班产能", width = 15)
    @ApiModelProperty(value = "班产能")
    private Integer scheduleNum;
    /**
     * å¤©äº§èƒ½
     */
    @Excel(name = "天产能", width = 15)
    @ApiModelProperty(value = "天产能")
    private Integer dayNum;
    /**
     * äº§çº¿
     */
    //@Excel(name = "产线", width = 15)
    //@ApiModelProperty(value = "产线")
    private String beltlineId;
//    /**
//     * è½¦é—´åç§°
//     */
//    @TableField(exist = false)
//    @Excel(name = "产线", width = 15)
//    @ApiModelProperty(value = "产线")
//    private String productionName;
    /**
     * æ˜¯å¦ä¸ºè‡ªåŠ¨çº¿
     */
    @Excel(name = "是否为自动线", width = 15)
    @ApiModelProperty(value = "是否为自动线")
    private String overallFlag;
    /**
     * è®¾å¤‡
     */
    @Excel(name = "设备", width = 15)
    @ApiModelProperty(value = "设备")
    private String equipmentId;
    /**
     * è½¦é—´ID
     */
    @Excel(name = "产线", width = 15)
    @ApiModelProperty(value = "产线")
    @Dict(dictTable ="mdc_production",dicText = "production_name",dicCode = "id")
    private String productionId;

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/ComponentInfoMapper.java

ÎļþÒÑɾ³ý

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcComponentInfoMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
package org.jeecg.modules.mdc.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.mdc.entity.MdcComponentInfo;

/**
 * @Description: é›¶ä»¶è¡¨
 * @Author: lius
 * @Date: 2024-10-21
 * @Version: V1.0
 */
public interface MdcComponentInfoMapper extends BaseMapper<MdcComponentInfo> {

    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param page
     * @param mdcComponentInfo
     * @return
     */
    IPage<MdcComponentInfo> pageList(Page<MdcComponentInfo> page, @Param("mdcComponentInfo") MdcComponentInfo mdcComponentInfo);
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/ComponentInfoMapper.xml

ÎļþÒÑɾ³ý

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml

@@ -46,10 +46,10 @@
        EquipmentAlarm t1 LEFT JOIN mdc_equipment t2 ON t1.EquipmentID = t2.equipment_id
        <where>
            <if test="equipmentAlarmVo.equipmentId != null and equipmentAlarmVo.equipmentId != ''">
                AND t1.EquipmentID  LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentId}),'%')
                AND t1.EquipmentID  LIKE '%' + #{equipmentAlarmVo.equipmentId} + '%'
            </if>
            <if test="equipmentAlarmVo.equipmentName != null and equipmentAlarmVo.equipmentName != ''">
                AND t2.equipment_name  LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentName}),'%')
                AND t2.equipment_name  LIKE '%' + #{equipmentAlarmVo.equipmentName} + '%'
            </if>
            <if test="equipmentAlarmVo.startTime != null and equipmentAlarmVo.endTime != null">
                AND t1.collectTime BETWEEN #{equipmentAlarmVo.startTime} AND #{equipmentAlarmVo.endTime}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentElectricStatisticalMapper.xml

@@ -9,10 +9,10 @@
            equipment_electric_statistical
        <where>
            <if test="equipmentElectricStatisticalVo.equipmentId != null and equipmentElectricStatisticalVo.equipmentId != ''">
                AND equipmentID  LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentId}),'%')
                AND equipmentID  LIKE '%' + #{equipmentElectricStatisticalVo.equipmentId} + '%'
            </if>
            <if test="equipmentElectricStatisticalVo.equipmentName != null and equipmentElectricStatisticalVo.equipmentName != ''">
                AND equipmentName  LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentName}),'%')
                AND equipmentName  LIKE '%' +#{equipmentElectricStatisticalVo.equipmentName} + '%'
            </if>
            <if test="equipmentElectricStatisticalVo.axistype != null and equipmentElectricStatisticalVo.axistype != ''">
                AND axisType = #{equipmentElectricStatisticalVo.axistype}
@@ -37,10 +37,10 @@
            equipment_electric_statistical
        <where>
            <if test="equipmentElectricStatisticalVo.equipmentId != null and equipmentElectricStatisticalVo.equipmentId != ''">
                AND equipmentID  LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentId}),'%')
                AND equipmentID  LIKE '%' + #{equipmentElectricStatisticalVo.equipmentId} + '%'
            </if>
            <if test="equipmentElectricStatisticalVo.equipmentName != null and equipmentElectricStatisticalVo.equipmentName != ''">
                AND equipmentName  LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentName}),'%')
                AND equipmentName  LIKE '%' + #{equipmentElectricStatisticalVo.equipmentName} + '%'
            </if>
            <if test="equipmentElectricStatisticalVo.axistype != null and equipmentElectricStatisticalVo.axistype != ''">
                AND axisType = #{equipmentElectricStatisticalVo.axistype}
@@ -65,10 +65,10 @@
            equipment_electric_statistical
        <where>
            <if test="equipmentElectricStatisticalVo.equipmentId != null and equipmentElectricStatisticalVo.equipmentId != ''">
                AND equipmentID  LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentId}),'%')
                AND equipmentID  LIKE '%' + #{equipmentElectricStatisticalVo.equipmentId} + '%'
            </if>
            <if test="equipmentElectricStatisticalVo.equipmentName != null and equipmentElectricStatisticalVo.equipmentName != ''">
                AND equipmentName  LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentName}),'%')
                AND equipmentName  LIKE '%' + #{equipmentElectricStatisticalVo.equipmentName} + '%'
            </if>
            <if test="equipmentElectricStatisticalVo.axistype != null and equipmentElectricStatisticalVo.axistype != ''">
                AND axisType = #{equipmentElectricStatisticalVo.axistype}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentSpindleStatisticalMapper.xml

@@ -9,10 +9,10 @@
            equipment_spindle_statistical
        <where>
            <if test="equipmentSpindleStatisticalVo.equipmentId != null and equipmentSpindleStatisticalVo.equipmentId != ''">
                AND equipmentID  LIKE CONCAT(CONCAT('%',#{equipmentSpindleStatisticalVo.equipmentId}),'%')
                AND equipmentID  LIKE '%' + #{equipmentSpindleStatisticalVo.equipmentId} + '%'
            </if>
            <if test="equipmentSpindleStatisticalVo.equipmentName != null and equipmentSpindleStatisticalVo.equipmentName != ''">
                AND equipmentName  LIKE CONCAT(CONCAT('%',#{equipmentSpindleStatisticalVo.equipmentName}),'%')
                AND equipmentName  LIKE '%' + #{equipmentSpindleStatisticalVo.equipmentName} + '%'
            </if>
            <if test="equipmentSpindleStatisticalVo.createDate != null and equipmentSpindleStatisticalVo.createDate != ''">
                AND createDate = #{equipmentSpindleStatisticalVo.createDate}
@@ -34,10 +34,10 @@
            equipment_spindle_statistical
        <where>
            <if test="equipmentSpindleStatisticalVo.equipmentId != null and equipmentSpindleStatisticalVo.equipmentId != ''">
                AND equipmentID  LIKE CONCAT(CONCAT('%',#{equipmentSpindleStatisticalVo.equipmentId}),'%')
                AND equipmentID  LIKE '%' + #{equipmentSpindleStatisticalVo.equipmentId} + '%'
            </if>
            <if test="equipmentSpindleStatisticalVo.equipmentName != null and equipmentSpindleStatisticalVo.equipmentName != ''">
                AND equipmentName  LIKE CONCAT(CONCAT('%',#{equipmentSpindleStatisticalVo.equipmentName}),'%')
                AND equipmentName  LIKE '%' + #{equipmentSpindleStatisticalVo.equipmentName} + '%'
            </if>
            <if test="equipmentSpindleStatisticalVo.createDate != null and equipmentSpindleStatisticalVo.createDate != ''">
                AND createDate = #{equipmentSpindleStatisticalVo.createDate}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcComponentInfoMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mdc.mapper.MdcComponentInfoMapper">

    <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcComponentInfo">
        SELECT
            t1.*,
            t2.production_name productionName
        FROM
            mdc_component_info t1
                LEFT JOIN mdc_production t2 ON t1.production_id = t2.id
        <where>
            <if test="mdcComponentInfo.componentName != null and mdcComponentInfo.componentName != ''">
                AND t1.component_name LIKE '%' + #{mdcComponentInfo.componentName} + '%'
            </if>
        </where>
    </select>
</mapper>

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcPassRateMapper.xml

@@ -7,10 +7,10 @@
        SELECT * FROM mdc_pass_rate
        <where>
            <if test="mdcPassRate.equipmentName != null and mdcPassRate.equipmentName != '' ">
                AND equipment_name LIKE CONCAT(CONCAT('%',#{mdcPassRate.equipmentName}),'%')
                AND equipment_name LIKE '%' + #{mdcPassRate.equipmentName} + '%')
            </if>
            <if test="mdcPassRate.equipmentId != null and mdcPassRate.equipmentId != '' ">
                AND equipment_id LIKE CONCAT(CONCAT('%',#{mdcPassRate.equipmentId}),'%')
                AND equipment_id LIKE '%' + #{mdcPassRate.equipmentId} + '%'
            </if>
            <if test="mdcPassRate.startTime != null and mdcPassRate.endTime != null">
                AND efficient_date BETWEEN #{ mdcPassRate.startTime } AND #{ mdcPassRate.endTime }

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessCountMapper.xml

@@ -23,7 +23,7 @@
                AND t1.equipment_id = #{ mdcProcessCountVo.equipmentId }
            </if>
            <if test="mdcProcessCountVo.equipmentName != null and mdcProcessCountVo.equipmentName != ''">
                AND t1.equipment_name LIKE CONCAT(CONCAT('%',#{mdcProcessCountVo.equipmentName}),'%')
                AND t1.equipment_name LIKE '%' + #{mdcProcessCountVo.equipmentName} + '%'
            </if>
            <if test="mdcProcessCountVo.driveType != null and mdcProcessCountVo.driveType != ''">
                AND t2.drive_type = #{ mdcProcessCountVo.driveType }
@@ -55,7 +55,7 @@
        FROM
            mdc_process_count
        WHERE
            equipment_id = #{ equipmentId } AND the_date LIKE CONCAT(#{ validDate }, '%')
            equipment_id = #{ equipmentId } AND the_date LIKE #{ validDate } + '%'
    </select>


@@ -65,6 +65,6 @@
        FROM
            mdc_process_count
        WHERE
            equipment_id = #{ equipmentId } AND the_date LIKE CONCAT(#{ validDate }, '%')
            equipment_id = #{ equipmentId } AND the_date LIKE #{ validDate } + '%'
    </select>
</mapper>

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IComponentInfoService.java

ÎļþÒÑɾ³ý

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcComponentInfoService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.jeecg.modules.mdc.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.entity.MdcComponentInfo;

import javax.servlet.http.HttpServletRequest;

/**
 * @Description: é›¶ä»¶è¡¨
 * @Author: lius
 * @Date: 2024-10-21
 * @Version: V1.0
 */
public interface IMdcComponentInfoService extends IService<MdcComponentInfo> {

    IPage<MdcComponentInfo> pageList(Page<MdcComponentInfo> page, MdcComponentInfo mdcComponentInfo, HttpServletRequest req);
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ComponentInfoServiceImpl.java

ÎļþÒÑɾ³ý

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcComponentInfoServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package org.jeecg.modules.mdc.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.mdc.entity.MdcComponentInfo;
import org.jeecg.modules.mdc.mapper.MdcComponentInfoMapper;
import org.jeecg.modules.mdc.service.IMdcComponentInfoService;
import org.springframework.stereotype.Service;

import javax.servlet.http.HttpServletRequest;

/**
 * @Description: é›¶ä»¶è¡¨
 * @Author: lius
 * @Date: 2024-10-21
 * @Version: V1.0
 */
@Service
public class MdcComponentInfoServiceImpl extends ServiceImpl<MdcComponentInfoMapper, MdcComponentInfo> implements IMdcComponentInfoService {

    @Override
    public IPage<MdcComponentInfo> pageList(Page<MdcComponentInfo> page, MdcComponentInfo mdcComponentInfo, HttpServletRequest req) {
        return this.baseMapper.pageList(page, mdcComponentInfo);
    }
}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/SysQuartzLogMapper.xml

@@ -26,10 +26,10 @@
                AND t1.create_time BETWEEN #{ sysQuartzLogVo.startTime } AND #{ sysQuartzLogVo.endTime }
            </if>
            <if test="sysQuartzLogVo.jobName != null and sysQuartzLogVo.jobName != ''">
                AND t2.job_name LIKE CONCAT(CONCAT('%',#{ sysQuartzLogVo.jobName }),'%')
                AND t2.job_name LIKE '%' + #{ sysQuartzLogVo.jobName } + '%'
            </if>
            <if test="sysQuartzLogVo.description != null and sysQuartzLogVo.description != ''">
                AND t2.description LIKE CONCAT(CONCAT('%',#{ sysQuartzLogVo.description }),'%')
                AND t2.description LIKE '%' + #{ sysQuartzLogVo.description }) + '%'
            </if>
        </where>
        ORDER BY t1.create_time DESC
@@ -59,10 +59,10 @@
                AND t1.create_time BETWEEN #{ sysQuartzLogVo.startTime } AND #{ sysQuartzLogVo.endTime }
            </if>
            <if test="sysQuartzLogVo.jobName != null and sysQuartzLogVo.jobName != ''">
                AND t2.job_name LIKE CONCAT(CONCAT('%',#{ sysQuartzLogVo.jobName }),'%')
                AND t2.job_name LIKE '%' + #{ sysQuartzLogVo.jobName } + '%'
            </if>
            <if test="sysQuartzLogVo.description != null and sysQuartzLogVo.description != ''">
                AND t2.description LIKE CONCAT(CONCAT('%',#{ sysQuartzLogVo.description }),'%')
                AND t2.description LIKE '%' + #{ sysQuartzLogVo.description } + '%'
            </if>
        </where>
        ORDER BY t1.create_time DESC

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/MdcProductionController.java

@@ -283,4 +283,11 @@
        return super.importExcel(request, response, MdcProduction.class);
    }

    @AutoLog(value = "产线表-")
    @ApiOperation(value = "产线表-", notes = "产线表-")
    @GetMapping(value = "/queryById")
    public Result<?> productionList() {
        List<MdcProduction> productionList = mdcProductionService.productionList();
        return Result.OK(productionList);
    }
}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml

@@ -46,10 +46,10 @@
       and sa.del_flag = '0'
       and sas.user_id = #{announcementSendModel.userId}
       <if test="announcementSendModel.titile !=null and announcementSendModel.titile != ''">
               and sa.titile LIKE concat(concat('%',#{announcementSendModel.titile}),'%')
               and sa.titile LIKE '%' + #{announcementSendModel.titile} + '%'
       </if>
       <if test="announcementSendModel.sender !=null and announcementSendModel.sender != ''">
               and sa.sender LIKE concat(concat('%',#{announcementSendModel.sender}),'%')
               and sa.sender LIKE '%' + #{announcementSendModel.sender} + '%'
       </if>
       <if test="announcementSendModel.readFlag !=null and announcementSendModel.readFlag != ''">
               and sas.read_flag = #{announcementSendModel.readFlag}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml

@@ -23,14 +23,14 @@

    <!-- æ ¹æ®éƒ¨é—¨Id查询,当前和下级所有部门IDS -->
    <select id="getSubDepIdsByDepId" resultType="java.lang.String">
        select id from sys_depart where del_flag = '0' and org_code like concat((select org_code from sys_depart where id=#{departId}),'%')
        select id from sys_depart where del_flag = '0' and org_code like (select org_code from sys_depart where id=#{departId}) +'%'
    </select>

    <!--根据部门编码获取我的部门下所有部门ids -->
    <select id="getSubDepIdsByOrgCodes" resultType="java.lang.String">
        select id from sys_depart where del_flag = '0' and
        <foreach collection="orgCodes" item="item" index="index"  open="(" separator="or" close=")">
            org_code LIKE CONCAT(#{item},'%')
            org_code LIKE #{item} + '%'
        </foreach>
    </select>
     <!--根据parent_id查询下级部门-->

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleMapper.xml

@@ -6,7 +6,7 @@
    <select id="queryDeptRoleByDeptAndUser" resultType="org.jeecg.modules.system.entity.SysDepartRole">
        SELECT * FROM sys_depart_role WHERE depart_id IN (
            SELECT id FROM sys_depart WHERE id IN (SELECT dep_id FROM sys_user_depart WHERE user_id=#{userId})
            AND org_code LIKE CONCAT(#{orgCode},'%')
            AND org_code LIKE #{orgCode} + '%'
        )
    </select>
</mapper>

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java

@@ -83,4 +83,7 @@
     * æ ¹æ®ç”¨æˆ·id查询用户工段权限
     */
    String findThreeProductionId(String userId);

    List<MdcProduction> productionList();

}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java

@@ -129,8 +129,8 @@
            // èŽ·å–父级ID
            String parentId = mdcProduction.getParentId();
            JSONObject formData = new JSONObject();
            formData.put("parentId",parentId);
            String[] codeArray = (String[]) FillRuleUtil.executeRule(FillRuleConstant.PRODUCTION,formData);
            formData.put("parentId", parentId);
            String[] codeArray = (String[]) FillRuleUtil.executeRule(FillRuleConstant.PRODUCTION, formData);
            mdcProduction.setOrgCode(codeArray[0]);
            String orgType = codeArray[1];
            mdcProduction.setOrgType(String.valueOf(orgType));
@@ -226,6 +226,7 @@

    /**
     * æ ¹æ®ç”¨æˆ·id和车间id获取用户拥有的车间id
     *
     * @param userId
     * @param productionId
     * @return
@@ -243,6 +244,11 @@
        return this.baseMapper.findThreeProductionId(userId);
    }

    @Override
    public List<MdcProduction> productionList() {
        return this.baseMapper.selectList(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getOrgType, "3").eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0));
    }

    /**
     * delete æ–¹æ³•è°ƒç”¨ é€’归查找子集id
     */

 lxzn-module-system/lxzn-system-start/src/main/resources/jeecg/jeecg_database.properties

@@ -21,7 +21,7 @@

#SQLServer2005\u4ee5\u4e0a
diver_name=org.hibernate.dialect.SQLServerDialect
url=jdbc:sqlserver://localhost:1433;DatabaseName=LXZN_TEST_430
url=jdbc:sqlserver://192.168.124.116:1433;DatabaseName=LXZN_MDC_YITUO
username=sa
password=123
database_name=LXZN_TEST_430
database_name=LXZN_MDC_YITUO