diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/OutSourceBean.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/OutSourceBean.java index 1ea704e..720b25e 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/OutSourceBean.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/OutSourceBean.java @@ -23,6 +23,8 @@ public class OutSourceBean { */ private String evaluateTitle; + private String auditState; + /** * 评价年月 */ @@ -79,4 +81,6 @@ public class OutSourceBean { private String createTime; private String searchDate; private String isAuditTask; + + private String checkOne; } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java index 21528bc..9fb2996 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java @@ -218,6 +218,11 @@ public class OutsourcerEvaluateController extends BaseController list); int isCheckTwoIsAudit(EvaluateDataBean o); + + /** + * 重新 + * @param o + */ + void updateEvalStatus(@Param("status") String status,@Param("id")String id); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/InitiateEvaluateServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/InitiateEvaluateServiceImpl.java index 1e5d364..bda2d30 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/InitiateEvaluateServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/InitiateEvaluateServiceImpl.java @@ -9,6 +9,7 @@ import com.bonus.gs.sub.evaluate.evaluate.dao.InitiateEvaluateDao; import com.bonus.gs.sub.evaluate.manager.model.SysUser; import com.bonus.gs.sub.evaluate.manager.utils.AjaxRes; import com.bonus.gs.sub.evaluate.manager.utils.GlobalConst; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -30,6 +31,7 @@ import java.util.stream.Stream; * @description: */ @Service("initiateEvaluateService") +@Slf4j public class InitiateEvaluateServiceImpl implements InitiateEvaluateService { @Resource private InitiateEvaluateDao dao; @@ -59,13 +61,13 @@ public class InitiateEvaluateServiceImpl implements InitiateEvaluateService { try { String subInfo = o.getSubInfo(); JSONArray jsonArray = JSONArray.parseArray(subInfo); - //判断是否已经发起过评价 - dao.deleteInitiateLink(o.getId()); - int count = dao.checkIsExistEvaluate(o.getOrgId(), o.getEvaluateDate()); + int count = dao.checkIsExistEvaluate(o); if (count > 0) { - ar.setFailMsg("当前事业部已经发起过评价，请勿重复发起!!!"); + ar.setFailMsg("当前事业部在"+o.getEvaluateDate()+"已经发起过评价，请勿重复发起!!!"); return ar; } + //判断是否已经发起过评价 + dao.deleteInitiateLink(o.getId()); String json = dao.getTemplationJson(o.getTemplateId()); JSONArray templationArr = JSONArray.parseArray(json); //循环templationArr 获取responsibleDepartment对其进行整合 @@ -150,6 +152,7 @@ public class InitiateEvaluateServiceImpl implements InitiateEvaluateService { uniqueDeptIdList.get(i), ("0".equals(uniqueDeptIdList.get(i)) || "-1".equals(uniqueDeptIdList.get(i))) ? "1" : "0")); ar.setRes(GlobalConst.SUCCEED); } catch (Exception e) { + log.error(e.toString(),e); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); ar.setFailMsg(GlobalConst.DATA_FAIL); return ar; diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java index 094aa3a..5315399 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java @@ -514,6 +514,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService } } outsourcerEvaluateDao.deleteEvaluateData(o); + outsourcerEvaluateDao.updateEvalStatus("2",o.getEvaluateId()); outsourcerEvaluateDao.saveEvaluateData(detailsList); o.setIsApprove("0"); o.setEvaluateType("3"); diff --git a/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/beans/ImportUserDataVo.java b/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/beans/ImportUserDataVo.java new file mode 100644 index 0000000..684f19e --- /dev/null +++ b/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/beans/ImportUserDataVo.java @@ -0,0 +1,26 @@ +package com.bonus.gs.sub.evaluate.outsourceEnterprise.beans; + +import lombok.Data; + +/** + * @author 黑子 + */ +@Data +public class ImportUserDataVo { + + private String name; + + private String code; + + private String createDay; + + private String userName; + + private String idCard; + + private String userPhone; + + private int row; + + +} diff --git a/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/controller/ViolationController.java b/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/controller/ViolationController.java index 35a853c..81efc36 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/controller/ViolationController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/controller/ViolationController.java @@ -6,6 +6,7 @@ import com.bonus.gs.sub.evaluate.manager.utils.AesCbcUtils; import com.bonus.gs.sub.evaluate.manager.utils.AjaxRes; import com.bonus.gs.sub.evaluate.manager.utils.GlobalConst; import com.bonus.gs.sub.evaluate.manager.utils.POIOutputHelperNumBer; +import com.bonus.gs.sub.evaluate.outsourceEnterprise.beans.ImportUserDataVo; import com.bonus.gs.sub.evaluate.outsourceEnterprise.beans.ViolationBean; import com.bonus.gs.sub.evaluate.outsourceEnterprise.dao.ViolationDao; import com.bonus.gs.sub.evaluate.outsourceEnterprise.service.ViolationService; @@ -193,6 +194,7 @@ public class ViolationController extends BaseController { AjaxRes ars = getAjaxRes(); Integer result = 0; int errorNum = 0; + Map map=new HashMap(); try { String fileName = file.getOriginalFilename(); System.out.println("OriginalFilename：" + fileName); @@ -227,15 +229,14 @@ public class ViolationController extends BaseController { Row row = hssfSheet.getRow(rownum); if (sheetRow != null && !isRowEmpty(sheetRow)) { // 先去判断 - ars = compareSaveData(sheetRow, rownum + 1); + ars = compareSaveData(sheetRow, rownum + 1,map); if (ars.getRes() == 2) { ar.setFailMsg(ars.getResMsg()); result = 2; - break; + return ar; } } } - if (result != 2) { for (int rownums = 2; rownums <= rowNum; rownums++) { Row sheetRows = hssfSheet.getRow(rownums); @@ -244,7 +245,6 @@ public class ViolationController extends BaseController { if (ar.getRes() == 0) { return ar; } - } } if (ar.getRes() == 1) { @@ -265,11 +265,10 @@ public class ViolationController extends BaseController { return ar; } - private AjaxRes compareSaveData(Row sheetRow, int rownum) throws Exception { + private AjaxRes compareSaveData(Row sheetRow, int rownum,Map map) throws Exception { AjaxRes ar = getAjaxRes(); try { String enterpriseName = getValue(sheetRow.getCell(0)).trim(); -// String socialCreditCode = getValue(sheetRow.getCell(1)).trim().replace(".0", ""); String socialCreditCode = translateToPlainStr(getValue(sheetRow.getCell(1)).trim()).replace(".0", ""); String setTime = getValue(sheetRow.getCell(2)).trim(); String corporateName = getValue(sheetRow.getCell(3)).trim(); @@ -278,7 +277,68 @@ public class ViolationController extends BaseController { if (StringUtils.isBlank(enterpriseName) || StringUtils.isBlank(socialCreditCode) || StringUtils.isBlank(setTime) || StringUtils.isBlank(corporateName) || StringUtils.isBlank(idCard) || StringUtils.isBlank(phone)) { ar.setFailMsg("第" + (rownum-1) + "行数据有误字段不能为空，导入失败"); ar.setRes(2); + return ar; } + ImportUserDataVo importUserDataVo=new ImportUserDataVo(); + importUserDataVo.setName(enterpriseName); + Integer num=service.getImportDataCheck(importUserDataVo); + if (num!=null && num>0) { + ar.setFailMsg("第" + (rownum-1) + "行企业名称已存在"); + ar.setRes(2); + return ar; + } + importUserDataVo=new ImportUserDataVo(); + importUserDataVo.setUserPhone(phone); + num=service.getImportDataCheck(importUserDataVo); + if (num!=null && num>0) { + ar.setFailMsg("第" + (rownum-1) + "手机号已存在"); + ar.setRes(2); + return ar; + } + importUserDataVo=new ImportUserDataVo(); + importUserDataVo.setIdCard(idCard); + num=service.getImportDataCheck(importUserDataVo); + if (num!=null && num>0) { + ar.setFailMsg("第" + (rownum-1) + "身份证号码已存在"); + ar.setRes(2); + return ar; + } + importUserDataVo=new ImportUserDataVo(); + importUserDataVo.setCode(socialCreditCode); + num=service.getImportDataCheck(importUserDataVo); + if (num!=null && num>0) { + ar.setFailMsg("第" + (rownum-1) + "统一社会信用代码已存在"); + ar.setRes(2); + return ar; + } + + importUserDataVo.setRow(rownum-1); + ImportUserDataVo his=map.get(socialCreditCode); + if(his!=null){ + ar.setFailMsg("第" + (rownum-1) + "行与"+his.getRow()+"行统一社会信用代码重复!"); + ar.setRes(2); + return ar; + }else{ + map.put(socialCreditCode,importUserDataVo); + } + + his=map.get(idCard); + if(his!=null){ + ar.setFailMsg("第" + (rownum-1) + "行与"+his.getRow()+"行身份证号码重复!"); + ar.setRes(2); + return ar; + }else{ + map.put(idCard,importUserDataVo); + } + + his=map.get(phone); + if(his!=null){ + ar.setFailMsg("第" + (rownum-1) + "行与"+his.getRow()+"行手机号重复!"); + ar.setRes(2); + }else{ + map.put(idCard,importUserDataVo); + } + } catch (Exception e) { logger.error(e.toString(), e); ar.setFailMsg("第" + rownum + "行数据有误，导入失败"); diff --git a/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/dao/ViolationDao.java b/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/dao/ViolationDao.java index e44c30b..f7125e5 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/dao/ViolationDao.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/dao/ViolationDao.java @@ -1,5 +1,6 @@ package com.bonus.gs.sub.evaluate.outsourceEnterprise.dao; +import com.bonus.gs.sub.evaluate.outsourceEnterprise.beans.ImportUserDataVo; import com.bonus.gs.sub.evaluate.outsourceEnterprise.beans.ViolationBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -42,4 +43,6 @@ public interface ViolationDao { List getOutsourceEnterpriseByPage(ViolationBean o); int formValidation(@Param("enterpriseName") String enterpriseName, @Param("id") String id); + + Integer getImportDataCheck(ImportUserDataVo dataVo); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/service/ViolationService.java b/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/service/ViolationService.java index c8771af..9f79c72 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/service/ViolationService.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/service/ViolationService.java @@ -2,6 +2,7 @@ package com.bonus.gs.sub.evaluate.outsourceEnterprise.service; import com.bonus.gs.sub.evaluate.manager.utils.AjaxRes; +import com.bonus.gs.sub.evaluate.outsourceEnterprise.beans.ImportUserDataVo; import com.bonus.gs.sub.evaluate.outsourceEnterprise.beans.ViolationBean; import org.springframework.data.domain.Page; @@ -27,4 +28,13 @@ public interface ViolationService { List exportOutsourceEnterprise(ViolationBean bean); List getOutsourceEnterpriseByPage(ViolationBean o); + + /** + * 导入数据校验 + * @param socialCreditCode + * @param idCard + * @param phone + * @return + */ + Integer getImportDataCheck(ImportUserDataVo dataVo); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/service/ViolationServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/service/ViolationServiceImpl.java index 1cae2eb..77468ee 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/service/ViolationServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/service/ViolationServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.gs.sub.evaluate.outsourceEnterprise.service; import com.bonus.gs.sub.evaluate.manager.utils.AjaxRes; import com.bonus.gs.sub.evaluate.manager.utils.RegularCheckUtils; +import com.bonus.gs.sub.evaluate.outsourceEnterprise.beans.ImportUserDataVo; import com.bonus.gs.sub.evaluate.outsourceEnterprise.beans.ViolationBean; import com.bonus.gs.sub.evaluate.outsourceEnterprise.dao.ViolationDao; import org.springframework.beans.factory.annotation.Autowired; @@ -168,6 +169,18 @@ public class ViolationServiceImpl implements ViolationService { return dao.getOutsourceEnterpriseByPage(o); } + /** + * 导入数据校验 + * @param socialCreditCode + * @param idCard + * @param phone + * @return + */ + @Override + public Integer getImportDataCheck(ImportUserDataVo dataVo) { + return dao.getImportDataCheck(dataVo); + } + /** * @param enterpriseName * @return diff --git a/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml b/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml index f21903a..a62dddb 100644 --- a/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml +++ b/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml @@ -151,6 +151,7 @@ r.proNum as projectNum, r.subNum as outsourcerNum, ifnull(GROUP_CONCAT(ped.post_id),'') as deptId, + ped.check_one checkOne, IF(ped.check_one is null, 0,IF( ped.check_one > 0, '0', '1' )) as isApprove, ped.isReject as isReject, IFNULL(c.evaluateNum,0) as evaluateNum, @@ -357,6 +358,7 @@ + \ No newline at end of file diff --git a/src/main/resources/static/js/evaluate/summaryAudit/summaryAudit.js b/src/main/resources/static/js/evaluate/summaryAudit/summaryAudit.js index 2d76da8..ed1d5d1 100644 --- a/src/main/resources/static/js/evaluate/summaryAudit/summaryAudit.js +++ b/src/main/resources/static/js/evaluate/summaryAudit/summaryAudit.js @@ -33,7 +33,7 @@ function search(type) { curr: 1 }, where: { - type:'audit', + type: 'audit', keyWord: $("#keyWord").val(), evaluateDeptId: $("#evaluateDeptId").val(), evStatus: $("#evStatus").val(), @@ -52,7 +52,7 @@ function initTable() { , method: 'get' //方式默认是get , toolbar: 'default' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档 , where: { - type:'audit', + type: 'audit', } //post请求必须加where ，post请求需要的参数 , cellMinWidth: 80 , cols: [[ //表头 @@ -64,16 +64,19 @@ function initTable() { , {field: 'evaluateMonth', align: 'center', title: '评价年月'} , {field: 'projectNum', align: 'center', title: '项目数量'} , {field: 'outsourcerNum', align: 'center', title: '外包商数量'} - , {field: 'isApprove', align: 'center', title: '评价状态', templet: d =>{ - if (d.rejectReason){ - return '评价驳回' - }else { - return Number(d.isApprove) === 0 ? '待评价' : (Number(d.isApprove) === 1 ? '已评价' : '') - } + , { + field: 'isApprove', align: 'center', title: '评价状态', templet: d => { + if (d.rejectReason) { + return '评价驳回' + } else { + return Number(d.isApprove) === 0 ? '待评价' : (Number(d.isApprove) === 1 ? '已评价' : '') + } // Number(d.isApprove) === 0 ? '待评价' : (Number(d.isApprove) === 1 ? '已评价' : '') - }} - , {field: 'status', align: 'center', title: '审核状态', templet: d => - Number(d.status) === 0 ? '待审核' : (Number(d.status) === 1 ? '已审核' : '审核中') + } + } + , { + field: 'status', align: 'center', title: '审核状态', templet: d => + Number(d.status) === 0 ? '待审核' : (Number(d.status) === 1 ? '已审核' : '审核中') } , {field: 'rejectReason', align: 'center', title: '驳回原因'} , { diff --git a/src/main/resources/static/login.html b/src/main/resources/static/login.html index 18da16a..0d10779 100644 --- a/src/main/resources/static/login.html +++ b/src/main/resources/static/login.html @@ -43,7 +43,10 @@ let urlParams = new URLSearchParams(window.location.search); let tokens = urlParams.get('tokens'); // 假设 URL 为 https://example.com/path?query=1 let loginName = urlParams.get('loginName'); - tokenVerify(tokens,loginName); + if(tokens && tokens!=='undefined'){ + tokenVerify(tokens,loginName); + } + // var token = localStorage.getItem("token"); // if (token != null && token.trim().length != 0) { // $.ajax({ diff --git a/src/main/resources/static/pages/evaluate/org/addForm.html b/src/main/resources/static/pages/evaluate/org/addForm.html index 7c34672..fc5f401 100644 --- a/src/main/resources/static/pages/evaluate/org/addForm.html +++ b/src/main/resources/static/pages/evaluate/org/addForm.html @@ -107,7 +107,7 @@
- +
diff --git a/src/main/resources/static/pages/evaluate/outsourceAudit/outsourceAuditList.html b/src/main/resources/static/pages/evaluate/outsourceAudit/outsourceAuditList.html index 9118b4a..26ce6c6 100644 --- a/src/main/resources/static/pages/evaluate/outsourceAudit/outsourceAuditList.html +++ b/src/main/resources/static/pages/evaluate/outsourceAudit/outsourceAuditList.html @@ -163,8 +163,13 @@ // Number(d.evaluateNum) > 0 && d.rejectReason ? '评价驳回' : (Number(d.evaluateNum) > 0 ? '已评价' : '未评价') } , { - field: 'auditStatus', align: 'center', title: '审核状态', templet: d => - Number(d.isApprove) > 0 && d.rejectReason ? '已驳回' : (Number(d.isApprove) > 0 ? '已通过' : (Number(d.evaluateNum) > 0 && d.isApprove == 0 ? '待审批' : '待评价')) + field: 'auditStatus', align: 'center', title: '审核状态', templet:function(d){ + if(d.auditState==='4' || d.auditState===4){ + return '已驳回' + }else{ + return Number(d.isApprove) > 0 && d.rejectReason ? '已驳回' : (Number(d.isApprove) === 1 ? '已通过' : (Number(d.evaluateNum) > 0 && d.isApprove == 0 ? '待审批' : '待评价')) + } + } } , { field: 'rejectReason', align: 'center', title: '驳回原因' } , { diff --git a/src/main/resources/static/pages/evaluate/outsourceEnterprise/outsourceEnterpriseList.html b/src/main/resources/static/pages/evaluate/outsourceEnterprise/outsourceEnterpriseList.html index e926810..0c6374a 100644 --- a/src/main/resources/static/pages/evaluate/outsourceEnterprise/outsourceEnterpriseList.html +++ b/src/main/resources/static/pages/evaluate/outsourceEnterprise/outsourceEnterpriseList.html @@ -304,7 +304,7 @@ search(1)*/ if (data.res === 0) { layer.close(idx); - layer.msg('导入失败' + data.resMsg, { icon: 1, time: 2000 }); + layer.msg('导入失败' + data.resMsg, { icon: 2, time: 2000 }); } else { layer.close(idx); layer.msg('导入成功', { icon: 1, time: 2000 }); diff --git a/src/main/resources/static/pages/evaluate/summaryAudit/otherEvaluateAuditForm.html b/src/main/resources/static/pages/evaluate/summaryAudit/otherEvaluateAuditForm.html index f6aee89..b026397 100644 --- a/src/main/resources/static/pages/evaluate/summaryAudit/otherEvaluateAuditForm.html +++ b/src/main/resources/static/pages/evaluate/summaryAudit/otherEvaluateAuditForm.html @@ -65,7 +65,7 @@ templateId: getUrlParam('templateId'), evaluateId: getUrlParam('evaluateId'), deptId: deptId, - evaluateType: '2', + evaluateType: '3', type: 'auditAll', }, success: function (res) { @@ -174,8 +174,6 @@ function allAudit(type) { let title = type === 1 ? '全部通过' : '全部驳回'; layer.confirm('确定' + title + '吗？', function (index) { - - if (type === 1) { $.ajax({ url: ctxPath + '/outsourcer/allAudit', @@ -185,7 +183,7 @@ templateId: getUrlParam('templateId'), evaluateId: getUrlParam('evaluateId'), type: type, - evaluateType: '2', + evaluateType: '3', deptId: getUrlParam('deptId'), isApprove: type diff --git a/src/main/resources/static/pages/evaluate/team/evaluateAllList.html b/src/main/resources/static/pages/evaluate/team/evaluateAllList.html index 70c258a..72fe49e 100644 --- a/src/main/resources/static/pages/evaluate/team/evaluateAllList.html +++ b/src/main/resources/static/pages/evaluate/team/evaluateAllList.html @@ -28,10 +28,9 @@
diff --git a/src/main/resources/static/pages/evaluate/team/evaluateCheckList.html b/src/main/resources/static/pages/evaluate/team/evaluateCheckList.html index 6df897c..44cfdc8 100644 --- a/src/main/resources/static/pages/evaluate/team/evaluateCheckList.html +++ b/src/main/resources/static/pages/evaluate/team/evaluateCheckList.html @@ -28,10 +28,10 @@
diff --git a/src/main/resources/static/pages/evaluate/team/evaluateList.html b/src/main/resources/static/pages/evaluate/team/evaluateList.html index 3c3c7c1..f4dcdd2 100644 --- a/src/main/resources/static/pages/evaluate/team/evaluateList.html +++ b/src/main/resources/static/pages/evaluate/team/evaluateList.html @@ -28,7 +28,7 @@