操作证模块调整

cuijian

2023-10-18 eebdc2717afe4b424e2cac2763c6f2fc55485431

操作证模块调整

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java

@@ -3,15 +3,16 @@
import java.io.UnsupportedEncodingException;
import java.io.IOException;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.eam.entity.OperationCertificateApplyDetail;
import org.jeecg.modules.system.service.SysIdentityService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -58,6 +59,9 @@
    @Autowired
    private IOperationCertificateDetailService operationCertificateDetailService;
    
     @Autowired
     private SysIdentityService sysIdentityService;
	
    /**
     * 分页列表查询
     *
@@ -97,6 +101,30 @@
        return Result.OK("添加成功！");
    }
    
     @PostMapping(value = "/addOperationCertificate")
     public Result<String> addOperationCertificate(@RequestBody List<OperationCertificateApplyDetail> operationCertificateList) {
        for(OperationCertificateApplyDetail operationCertificateApplyDetail : operationCertificateList){
            if("Y".equals(operationCertificateApplyDetail.getExaminationConclusion())){
                Date currentDate = new Date();
                Calendar c = Calendar.getInstance();
                c.setTime(currentDate);
                c.add(Calendar.YEAR, 1);
                currentDate = c.getTime();
                OperationCertificate operationCertificate = new OperationCertificate();
                operationCertificate.setNum(sysIdentityService.getNumByTypeAndLength("OperationCertificate", 4));
                operationCertificate.setUserId(operationCertificateApplyDetail.getUserId());
                operationCertificate.setEquipmentIds(operationCertificateApplyDetail.getEquipmentIds());
                operationCertificate.setCurrentCycleScore(12);
                operationCertificate.setIssueDate(new Date());
                operationCertificate.setStartTime(new Date());
                operationCertificate.setEndTime(currentDate);
                operationCertificate.setStatus("1");
                operationCertificateService.save(operationCertificate);
            }
        }
         return Result.OK("添加成功！");
     }
	
    /**
     *  编辑
     *

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

@@ -1,10 +1,8 @@
package org.jeecg.modules.eam.entity;

import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.aspect.annotation.Dict;
@@ -100,4 +98,10 @@
    @Excel(name = "属性字段5", width = 15)
    @ApiModelProperty(value = "属性字段5")
    private String uda5;

    @TableField(exist = false)
    private String realname;

    @TableField(exist = false)
    private String equipmentNames;
}

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

@@ -9,8 +9,10 @@
             operation_certificate_apply_id = #{mainId}     </delete>
    
    <select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.eam.entity.OperationCertificateApplyDetail">
        SELECT * 
        FROM  mom_eam_operation_certificate_apply_detail
        SELECT t1.*,t2.realname,t3.name equipmentNames
        FROM  mom_eam_operation_certificate_apply_detail t1
        left join (select * from sys_user where del_flag = 0) t2 on t1.user_id = t2.username
        left join (select * from mom_eam_equipment where del_flag = 0) t3 on t1.equipment_ids = t3.id
        WHERE
             operation_certificate_apply_id = #{mainId}     </select>
</mapper>