修复保养的查询错误

yangys

2024-01-14 2f70353f2399f1acec456de42c00f9b2e2452154

修复保养的查询错误

 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/MachineEditController.java

@@ -5,13 +5,14 @@
import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.validation.annotation.Validated;

import org.springframework.web.bind.annotation.CrossOrigin;

import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestHeader;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.springframework.web.bind.annotation.RestController;



import com.qianwen.mdc.common.OpResult;

import com.qianwen.mdc.dto.IdsDTO;

import com.qianwen.mdc.dto.machine.MachineDTO;

import com.qianwen.mdc.service.machine.MachineEditService;

import com.qianwen.mdc.vallidate.AddGroup;

@@ -30,7 +31,7 @@
    

    public static final Logger logger = LoggerFactory.getLogger(MachineEditController.class);

    

    @RequestMapping(value = "/modify", method = RequestMethod.POST)

    @PostMapping(value = "/modify")

    public OpResult<Void> modify(@RequestHeader(value = "mdc-token", defaultValue = "") String token,

            @Validated(value = {UpdateGroup.class,AddGroup.class,}) @RequestBody MachineDTO machineDTO) {

       

@@ -51,12 +52,12 @@
     * @param request

     * @return

     */

    @RequestMapping(value = "/delete", method = RequestMethod.POST)

    @PostMapping(value = "/delete")

    public OpResult<Void> delete(@RequestHeader(value = "mdc-token", defaultValue = "") String token,

            Integer id) {

            @RequestBody IdsDTO dto) {

        

        try {

            editService.delete(id);

            editService.delete(dto.getIds());

        }catch(Exception ex) {

            logger.error("删除机床失败",ex);

            return OpResult.fail(ex.getMessage());

@@ -65,14 +66,20 @@
        return OpResult.success();

    }

   

    @RequestMapping(value = "/concern", method = RequestMethod.POST)

    /**

     * ç»™æœºåºŠè®¾ç½®å…³æ³¨æ ‡è®°

     * @param token

     * @param dto åŒ…含id，concern参数

     * @return

     */

    @PostMapping(value = "/concern")

    public OpResult<Void> switchConcern(@RequestHeader(value = "mdc-token", defaultValue = "") String token,

            Integer id,int concern) {

       
            @RequestBody MachineDTO dto) {

       //Integer id,int concern

        try {

            editService.switchConcern(id,concern);

            editService.switchConcern(dto.getId(),dto.getConcern());

        }catch(Exception ex) {

            logger.error("设置关注失败",ex);

            logger.error("机床设置关注失败",ex);

            return OpResult.fail(ex.getMessage());

        }




 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/MachineMaintainController.java

@@ -9,6 +9,7 @@
import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.web.bind.annotation.CrossOrigin;

import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestHeader;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

@@ -18,6 +19,7 @@
import com.alibaba.fastjson.JSONObject;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import com.qianwen.mdc.common.OpResult;

import com.qianwen.mdc.dto.IdsDTO;

import com.qianwen.mdc.dto.MachineMaintainDTO;

import com.qianwen.mdc.dto.MachineMaintainFullDTO;

import com.qianwen.mdc.dto.MachineMaintainQueryDTO;

@@ -146,14 +148,14 @@


    @RequestMapping(value = "/delete", method = RequestMethod.POST)

    public OpResult<Void> delete(@RequestHeader(value = "mdc-token", defaultValue = "") String token,

            @RequestParam List<Integer> ids, HttpServletRequest request) {

            @RequestBody IdsDTO dto, HttpServletRequest request) {

        accountTokenService.checkToken(token);



        JSONObject jsonResult = new JSONObject();

        jsonResult.put("result", "SUCCESS");



        try {

            editService.delete(ids);

            editService.delete(dto.getIds());

            return OpResult.success();

        }catch(Exception e) {

            logger.error("删除维护记录失败",e);


 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/PlantEditController.java

@@ -12,11 +12,14 @@
import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestHeader;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.springframework.web.bind.annotation.RestController;



import com.alibaba.fastjson.JSONObject;

import com.qianwen.mdc.common.OpResult;

import com.qianwen.mdc.dto.IdsDTO;

import com.qianwen.mdc.dto.PlantDTO;

import com.qianwen.mdc.service.plant.PlantService;

import com.qianwen.mdc.vallidate.AddGroup;

@@ -76,6 +79,20 @@
        return OpResult.success();

    }

    

    @RequestMapping(value = "/delete", method = RequestMethod.POST)

    public OpResult<Void> delete(@RequestHeader(value = "mdc-token", defaultValue = "") String token,

            @RequestBody IdsDTO dto, HttpServletRequest request) {

        //accountTokenService.checkToken(token);



         try {

             plantService.delete(dto.getIds());

            return OpResult.success();

        }catch(Exception e) {

            logger.error("删除维护记录失败",e);

            return OpResult.fail(e.getMessage());

        }

    }

    
    /**

     * å…¨éƒ¨è½¦é—´åˆ—表

     * @param request


 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/SysAccountController.java

@@ -1,5 +1,7 @@
package com.qianwen.mdc.controller;



import java.util.List;



import javax.annotation.Resource;



import org.slf4j.Logger;

@@ -68,29 +70,16 @@
        }

    }

    

    @RequestMapping(value = "/list", method = RequestMethod.POST)

    public JSONObject getUserList(@RequestHeader(value = "mdc-token", defaultValue = "") String token) {

        /*

        AccountToken mdcTokenObj = new AccountToken();

        mdcTokenObj.setToken(token);

        AccountToken mdcToken = mdcTokenMapper.selectOne(mdcTokenObj);

        JSONObject tokenResult = MdcTokenServiceImpl.genTokenErrMsg(mdcToken);

        if (tokenResult != null) {

            return tokenResult;

    @GetMapping(value = "/list")

    public OpResult<List<SysAccountDTO>> getUserList(@RequestHeader(value = "mdc-token", defaultValue = "") String token) {

        try {

        	
            return OpResult.success(accountService.allSysAccounts());

        }catch(Exception e) {

            logger.error("userlist查询异常",e);

            return OpResult.fail(e.getMessage());

        }



        mdcToken.setExpireTime(MdcTokenServiceImpl.genExpiredTime());

        mdcTokenMapper.updateByPrimaryKeySelective(mdcToken);



        JSONObject jsonResult = new JSONObject();

        jsonResult.put("result", "SUCCESS");



        List<SysAccount> mdcUsers = mdcUserMapper.selectAll();

        jsonResult.put("list", mdcUsers);



        return jsonResult;

        */

        return null;

    	
    }



    


 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/account/MachineAccountAddController.java

@@ -11,10 +11,10 @@
import org.springframework.beans.factory.annotation.Value;

import org.springframework.web.bind.annotation.CrossOrigin;

import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestHeader;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.springframework.web.bind.annotation.RestController;



import com.qianwen.mdc.common.OpResult;

@@ -25,7 +25,7 @@
import com.qianwen.mdc.service.account.StaticData;



/**

 * å°è´¦æ–°å¢ž

 * å°è´¦æ–°å¢žæŽ§åˆ¶å™¨

 */

@RestController

@CrossOrigin

@@ -43,7 +43,7 @@
    

    public static final Logger logger = LoggerFactory.getLogger(MachineAccountAddController.class);

    

    @RequestMapping(value = "/create", method = RequestMethod.POST)

    @PostMapping(value = "/create")

    public OpResult<Void> create(@RequestHeader(value = "mdc-token", defaultValue = "") String token,

          @RequestBody MachineAccountEditDTO dto, HttpServletRequest request) {

        /*


 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/devicetype/DeviceTypeController.java

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


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import com.qianwen.mdc.common.OpResult;

import com.qianwen.mdc.dto.IdsDTO;

import com.qianwen.mdc.dto.devicetype.DeviceTypeDTO;

import com.qianwen.mdc.service.devicetype.DeviceTypeService;



@@ -85,7 +86,7 @@
     * @return

     */

    @GetMapping(value = "/{id}")

    public OpResult<DeviceTypeDTO> pageQuery(@PathVariable("id") Integer id) {

    public OpResult<DeviceTypeDTO> get(@PathVariable("id") Integer id) {

        try {

            DeviceTypeDTO d = deviceTypeService.get(id);

            return OpResult.success(d);

@@ -98,12 +99,11 @@
    

    @RequestMapping(value = "/delete", method = RequestMethod.POST)

    public OpResult<Void> delete(@RequestHeader(value = "mdc-token", defaultValue = "") String token,

            @RequestParam List<Integer> ids, HttpServletRequest request) {

        //accountTokenService.checkToken(token);



       
            @RequestBody IdsDTO dto, HttpServletRequest request) {

        //accountTokenService.checkToken(token);@RequestParam List<Integer> ids

    	
        try {

            deviceTypeService.delete(ids);

            deviceTypeService.delete(dto.getIds());

            return OpResult.success();

        }catch(Exception e) {

            logger.error("删除失败",e);


 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/domain/MachineAccount.java

@@ -31,17 +31,17 @@
    private String machineName;



    /**

     * machine uuid

     * ç»Ÿä¸€ç¼–号

     */

    private String uuid;



    /**

     * machine specification

     * è§„æ ¼

     */

    private String specification;



    /**

     * machine type

     * åž‹å·

     */

    private String type;




 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/domain/maintain/MachineMaintain.java

@@ -10,9 +10,7 @@
 */

@TableName("machine_maintain")

public class MachineMaintain implements Serializable {

    /**

     * primary key

     */

    
    @TableId(type=IdType.AUTO)

    private Integer id;



@@ -23,7 +21,7 @@
    private Integer machineId;



    /**

     * user id

     * ä¿å…»è€… user id

     */

    //@Column(name = "user_id")

    private Integer userId;

@@ -39,15 +37,7 @@
     */

    private Integer style;



    /**

     * ç»Ÿä¸€ç¼–号

     */

    private String sn;



    /**

     * è®¾å¤‡åž‹å·ï¼Œæ–‡æœ¬

     */

    private String type;



    /**

     * è¯¥å­—段目前没有使用

@@ -96,7 +86,7 @@
    /**

     * ä½¿ç”¨å•ä½ï¼ˆæ–‡å­—）：工艺/编制/生产

     */

    private String department;

    private Integer department;

    

    private static final long serialVersionUID = 1L;



@@ -141,20 +131,7 @@
        this.style = style;

    }



    public String getType() {

        return type;

    }



  
    public void setType(String type) {

        this.type = type;

    }



    /**

     * èŽ·å–start date from

     *

     * @return start_date_from - start date from

     */

    public Date getStartDateFrom() {

        return startDateFrom;

    }

@@ -196,14 +173,6 @@
        this.isQualified = isQualified;

    }



   
    public String getSn() {

        return sn;

    }



    public void setSn(String sn) {

        this.sn = sn;

    }



    public String getStatus() {

        return status;

@@ -221,12 +190,12 @@
        this.detail = detail;

    }



    public String getDepartment() {

    public Integer getDepartment() {

        return department;

    }



    public void setDepartment(String department) {

    public void setDepartment(Integer department) {

        this.department = department;

    }



    
}

 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/IdsDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.qianwen.mdc.dto;

import java.util.List;

/**
 * åªæœ‰ids(id List)参数，主要用户批量删除这类场景的参数传递
 */
public class IdsDTO {
    private List<Integer> ids;

    public List<Integer> getIds() {
        return ids;
    }

    public void setIds(List<Integer> ids) {
        this.ids = ids;
    }
	
	
}

 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/MachineMaintainDTO.java

@@ -66,9 +66,9 @@
    private Integer userId;

    

    /**

     * ä½¿ç”¨å•ä½ï¼ˆæ–‡å­—）：工艺/编制/生产

     * ä½¿ç”¨å•ä½ï¼š1工艺/2编制/3生产

     */

    private String department;

    private Integer department;

    

    public Integer getId() {

        return id;

@@ -142,10 +142,10 @@
    public void setUserId(Integer userId) {

        this.userId = userId;

    }

    public String getDepartment() {

    public Integer getDepartment() {

        return department;

    }

    public void setDepartment(String department) {

    public void setDepartment(Integer department) {

        this.department = department;

    }

    


 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/MachineMaintainFullDTO.java

@@ -25,7 +25,7 @@
    private Integer machineId;

    private String machineName;

    /**

     * è®¾å¤‡åž‹å·ï¼Œæ–‡æœ¬

     * è®¾å¤‡åž‹å·ï¼Œå°è´¦é‡Œçš„信息

     */

    private String type;

    /**

@@ -59,9 +59,18 @@
    private String userName;

    

    /**

     * ä½¿ç”¨å•ä½ï¼ˆæ–‡å­—）：工艺/编制/生产

     * ä½¿ç”¨å•ä½ï¼ˆæ–‡å­—）：1工艺/2编制/3生产

     */

    private String department;

    private Integer department;

    /**

     * éƒ¨é—¨åç§°ï¼Œä»Žuse_department联合查询而来

     */

    private String departmentName;

    /**

     * è§„格，台账里的信息

     */

    private String specification;

   
    

    public Integer getId() {

        return id;

@@ -135,10 +144,11 @@
    public void setUserId(Integer userId) {

        this.userId = userId;

    }

    public String getDepartment() {

	
    public Integer getDepartment() {

        return department;

    }

    public void setDepartment(String department) {

    public void setDepartment(Integer department) {

        this.department = department;

    }

    public String getMachineName() {

@@ -153,6 +163,18 @@
    public void setUserName(String userName) {

        this.userName = userName;

    }

    public String getDepartmentName() {

        return departmentName;

    }

    public void setDepartmentName(String departmentName) {

        this.departmentName = departmentName;

    }

    public String getSpecification() {

        return specification;

    }

    public void setSpecification(String specification) {

        this.specification = specification;

    }

    

    

}


 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/MachineMaintainQueryDTO.java

@@ -12,7 +12,7 @@
    /**

     * ç»Ÿä¸€ç¼–号

     */

    private String sn;

    private String uuid;

    

    /*

     * ä¿å…»ç±»åž‹ï¼Œ1：日常保养；2:一级保养；3：二级保养；4：三级保养

@@ -53,16 +53,11 @@
    private Integer userId;

    

    /**

     * ä½¿ç”¨å•ä½ï¼ˆæ–‡å­—）：工艺/编制/生产

     * ä½¿ç”¨å•ä½id：1工艺/2编制/3生产

     */

    private String department;

    private Integer department;

    

    public String getSn() {

        return sn;

    }

    public void setSn(String sn) {

        this.sn = sn;

    }

    
    public Integer getStyle() {

        return style;

    }

@@ -123,12 +118,17 @@
    public void setUserId(Integer userId) {

        this.userId = userId;

    }

    public String getDepartment() {

    public String getUuid() {

        return uuid;

    }

    public void setUuid(String uuid) {

        this.uuid = uuid;

    }

    public Integer getDepartment() {

        return department;

    }

    public void setDepartment(String department) {

    public void setDepartment(Integer department) {

        this.department = department;

    }

    
    
	
}


 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/account/MachineAccountDTO.java

@@ -134,7 +134,10 @@
     * å¤‡æ³¨

     */

    private String remark;



    /**

     * çŠ¶æ€ï¼Œä»Žmachine_status获取

     */

    private String status;

    private static final long serialVersionUID = 1L;



    public Integer getId() {

@@ -357,4 +360,12 @@
        this.manageType = manageType;

    }



    public String getStatus() {

        return status;

    }



    public void setStatus(String status) {

        this.status = status;

    }



}


 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/machine/MachineDTO.java

@@ -59,6 +59,10 @@
    @NotNull(message = "厂房不能为空")

    private Integer plantId;

    

    /**

     * å…³æ³¨æ ‡è®°

     */

    private  Integer concern;

    

    public Integer getId() {

        return id;

@@ -147,6 +151,14 @@
    public void setPlantId(Integer plantId) {

        this.plantId = plantId;

    }



    public Integer getConcern() {

        return concern;

    }



    public void setConcern(Integer concern) {

        this.concern = concern;

    }

    

    

}


 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/MdcDataArchiveService.java

@@ -32,7 +32,7 @@
import lombok.extern.slf4j.Slf4j;



/**

 * æ•°æ®å½’档服务

 * æ•°æ®å½’档服务,将 machine_status æ•°æ®å¯¼å…¥machine_status_history表,并加入最新的machine_status数据

 */

@Slf4j

@Component

@@ -93,7 +93,7 @@
            

            //List<MdcMachineAccount> list = mdcMachineAccountMapper.selectList(wrapperAcc);

            List<MachineAccount> list = machineAccountMapper.lastByMachineId(status.getMachineId());

            if ((list == null) || (list.size() == 0)) {

            if (list.isEmpty()) {

                continue;

            }

            MachineAccount account = list.get(0);


 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/devicetype/DeviceTypeService.java

@@ -79,6 +79,9 @@
        DeviceType dtype;

        for(Integer id : ids) {

            dtype = deviceTypeMapper.selectById(id);

            if(dtype == null) {

                continue;

            }

            dtype.markDeleted();

            deviceTypeMapper.updateById(dtype);

        }


 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/machine/MachineEditService.java

@@ -1,5 +1,7 @@
package com.qianwen.mdc.service.machine;



import java.util.List;



import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

@@ -41,11 +43,12 @@
     * @param id

     */

    @Transactional

    public void delete(Integer id) {

        //需要其他数据的删除或者处理写在这里。。

		
    public void delete(List<Integer> ids) {

        //删除设备数据

        machineMapper.deleteById(id);

        for(Integer id : ids) {

            machineMapper.deleteById(id);

        }

		
    }



    /*


 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/maintain/MachineMaintainAddService.java

@@ -27,7 +27,7 @@
        mm.setDetail(dto.getDetail());

        mm.setIsQualified(dto.getIsQualified());

        mm.setMachineId(dto.getMachineId());

        mm.setSn(dto.getSn());



        mm.setStartDateFrom(dto.getStartDateFrom());

        mm.setStartDateTo(dto.getStartDateTo());

        mm.setStyle(dto.getStyle());


 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/maintain/MachineMaintainEditService.java

@@ -29,11 +29,10 @@
        mm.setDetail(dto.getDetail());

        mm.setIsQualified(dto.getIsQualified());

        mm.setMachineId(dto.getMachineId());

        mm.setSn(dto.getSn());

        mm.setStartDateFrom(dto.getStartDateFrom());

        mm.setStartDateTo(dto.getStartDateTo());

        mm.setStyle(dto.getStyle());

        mm.setType(dto.getType());



        mm.setUserId(dto.getUserId());

        mm.setDepartment(dto.getDepartment());

        


 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/plant/PlantService.java

@@ -19,7 +19,10 @@
public class PlantService {

    @Autowired

    private PlantMapper plantMapper;

	
    /**

     * æ–°å¢žåŽ‚房

     * @param plantDTO

     */

    @Transactional

    public void save(PlantDTO plantDTO) {



@@ -30,6 +33,10 @@
        plantMapper.insert(p);

    }

    

    /**

     * ä¿®æ”¹åŽ‚房

     * @param plantDTO

     */

    @Transactional

    public void modify(PlantDTO plantDTO) {



@@ -40,7 +47,11 @@
        plantMapper.updateById(p);

    }

    

    @Transactional

    /**

     * æ‰€æœ‰åŽ‚房列表

     * @return

     */

    @Transactional(readOnly=true)

    public List<PlantDTO> list() {



        List<Plant> plist = plantMapper.selectList(null);

@@ -54,4 +65,14 @@
            }).collect(Collectors.toList());

       

    }

	
    /**

     * åˆ é™¤åŽ‚房

     * @param ids åŽ‚房id列表

     */

    @Transactional

    public void delete(List<Integer> ids) {

        //TODO æ£€æŸ¥åŽ‚房的设备数量

		
    }

}


 mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/sysaccount/SysAccountService.java

@@ -1,6 +1,7 @@
package com.qianwen.mdc.service.sysaccount;



import java.util.List;

import java.util.stream.Collectors;



import org.apache.commons.lang3.StringUtils;

import org.slf4j.Logger;

@@ -100,4 +101,19 @@
        return result;

    }

    

    @Transactional(readOnly=true)

    public List<SysAccountDTO> allSysAccounts() {

		
        List<SysAccount> atlist = sysAccountMapper.selectList(null);

		
        return atlist.stream().map(acc -> {

            SysAccountDTO dto = new SysAccountDTO();

            dto.setId(acc.getId());

            dto.setName(acc.getName());

            dto.setUsername(acc.getUsername());

            dto.setCreateTime(acc.getCreateTime());

            return dto;

        }).collect(Collectors.toList());

		
    }

}


 mdc-parent/mdc-showdb-mysql/src/main/resources/mapper/MachineAccountMapper.xml

@@ -32,9 +32,9 @@


  <select id="queryPage" parameterType="com.qianwen.mdc.dto.account.MachineAccountQueryDTO" resultType="com.qianwen.mdc.dto.account.MachineAccountDTO">

        select

            a.id,

            a.machine_id machineId,

            a.uuid,

            a.id,

            a.specification,

            a.type,

            a.category,

@@ -53,9 +53,11 @@
            a.pic,

            a.remark,

            a.manage_type manageType,

            a.classes

            a.classes,

            ms.status

        from machine_account a

        left join use_department ud on a.department=ud.id

        left join (select max(id) id,machine_id,status from machine_status group by machine_id,status) ms on a.machine_id=ms.machine_id

        <where>

         <if test="dto.uuid != null and dto.uuid != ''">

             <bind name="uuid" value="'%' + dto.uuid + '%'" />


 mdc-parent/mdc-showdb-mysql/src/main/resources/mapper/MachineMaintainMapper.xml

@@ -8,8 +8,6 @@
    <result column="user_id" jdbcType="INTEGER" property="userId" />

    <result column="machine_account_id" jdbcType="INTEGER" property="machineAccountId" />

    <result column="style" jdbcType="INTEGER" property="style" />

    <result column="sn" jdbcType="VARCHAR" property="sn" />

    <result column="type" jdbcType="VARCHAR" property="type" />

    <result column="period" jdbcType="VARCHAR" property="period" />

    <result column="start_date_from" jdbcType="TIMESTAMP" property="startDateFrom" />

    <result column="start_date_to" jdbcType="TIMESTAMP" property="startDateTo" />

@@ -18,7 +16,7 @@
    <result column="is_qualified" jdbcType="BIT" property="isQualified" />

    <result column="status" jdbcType="VARCHAR" property="status" />

    <result column="detail" jdbcType="VARCHAR" property="detail" />

    <result column="department" jdbcType="VARCHAR" property="department" />

    <result column="department" jdbcType="INTEGER" property="department" />

  </resultMap>

  

  <resultMap id="FullResultMap" type="com.qianwen.mdc.dto.MachineMaintainFullDTO">

@@ -30,7 +28,7 @@
    <result column="user_name" jdbcType="VARCHAR" property="userName" />

    <result column="machine_account_id" jdbcType="INTEGER" property="machineAccountId" />

    <result column="style" jdbcType="INTEGER" property="style" />

    <result column="sn" jdbcType="VARCHAR" property="sn" />

    <result column="uuid" jdbcType="VARCHAR" property="uuid" />

    <result column="type" jdbcType="VARCHAR" property="type" />

    <result column="period" jdbcType="VARCHAR" property="period" />

    <result column="start_date_from" jdbcType="TIMESTAMP" property="startDateFrom" />

@@ -41,22 +39,26 @@
    <result column="status" jdbcType="VARCHAR" property="status" />

    <result column="detail" jdbcType="VARCHAR" property="detail" />

    <result column="department" jdbcType="VARCHAR" property="department" />

    <result column="department_name" jdbcType="VARCHAR" property="departmentName" />

    <result column="specification" jdbcType="VARCHAR" property="specification" />

   
  </resultMap>

  

  <select id="queryPage" resultMap="FullResultMap">

  
      SELECT mm.id,mm.machine_id,m.name machine_name,mm.user_id,u.name user_name,style,department,sn,mm.type,start_date_from,start_date_to,complete_date_from,complete_date_to,is_qualified,mm.status,mm.detail 
      SELECT mm.id,mm.machine_id,m.name machine_name,mm.user_id,u.name user_name,style,mm.department,ud.name department_name,ma.uuid,ma.type,start_date_from,start_date_to,complete_date_from,complete_date_to,is_qualified,mm.status,mm.detail 
      FROM machine_maintain mm left join machine m on mm.machine_id=m.id left join sys_account u on mm.user_id=u.id

      left join machine_account ma on m.id=ma.machine_id

      left join use_department ud on mm.department=ud.id

      <where>

           <if test="dto.sn != null and dto.sn != ''">

               <bind name="sn" value="'%' + dto.sn + '%'" />

           and sn like #{sn}

           <if test="dto.uuid != null and dto.uuid != ''">

               <bind name="uuid" value="'%' + dto.uuid + '%'" />

           and ma.uuid like #{uuid}

         </if>

         <if test="dto.type != null and dto.type != ''">

             <bind name="type" value="'%' + dto.type + '%'" />

           and type like #{type}

           and ma.type like #{type}

         </if>

         <if test="dto.department != null and dto.department != ''">

         <if test="dto.department != null">

           and department=#{dto.department}

         </if>

         <if test="dto.machineId != null">