diff --git a/modules/bmw/src/main/java/com/bonus/bmw/basic/dao/OwnerDao.java b/modules/bmw/src/main/java/com/bonus/bmw/basic/dao/OwnerDao.java index 43a4edd..77e570b 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/basic/dao/OwnerDao.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/basic/dao/OwnerDao.java @@ -32,7 +32,7 @@ public interface OwnerDao { /*** 根据id查询信息* */ OwnerBean getOwnerById(String id); - int getOwnerByName(@Param("name") String name,@Param("ownerName") String ownerName); + int getOwnerByName(@Param("name") String name,@Param("ownerName") String ownerName,@Param("ownerPhone") String ownerPhone); Integer importData(@Param("list") List list); diff --git a/modules/bmw/src/main/java/com/bonus/bmw/basic/service/OwnerServiceImpl.java b/modules/bmw/src/main/java/com/bonus/bmw/basic/service/OwnerServiceImpl.java index f80bf62..0f6ff34 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/basic/service/OwnerServiceImpl.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/basic/service/OwnerServiceImpl.java @@ -32,7 +32,7 @@ public class OwnerServiceImpl implements OwnerService { if (StringUtils.isEmpty(bean.getName())){ return R.fail(null,"添加失败,缺少业主单位名称"); }else{ - int dis = dao.getOwnerByName(bean.getName(),bean.getOwnerName()); + int dis = dao.getOwnerByName(bean.getName(),bean.getOwnerName(),bean.getOwnerPhone()); if (dis > 0){ System.out.println("添加失败,已存在重复的业主单位"); return R.fail(null,"添加失败,已存在重复的业主单位"); @@ -49,7 +49,7 @@ public class OwnerServiceImpl implements OwnerService { if (StringUtils.isEmpty(bean.getName())){ return R.fail(null,"修改失败,缺少业主单位名称"); }else{ - int dis = dao.getOwnerByName(bean.getName(),bean.getOwnerName()); + int dis = dao.getOwnerByName(bean.getName(),bean.getOwnerName(),bean.getOwnerPhone()); if (dis >= 1){ System.out.println("修改失败,已存在重复的业主单位"); return R.fail(null,"修改失败,已存在重复的业主单位"); @@ -83,6 +83,10 @@ public class OwnerServiceImpl implements OwnerService { }else if(bean.getOwnerPhone()==null || bean.getOwnerPhone().length()<1){ return "第" + (i+1) + "行联系方式为空,导入失败"; } + int dis = dao.getOwnerByName(bean.getName(),bean.getOwnerName(),bean.getOwnerPhone()); + if (dis > 0){ + return "第" + (i+1) + "行添加失败,已存在重复的业主单位,导入失败"; + } } Integer result = dao.importData(list); if (result != null && result > 0){ diff --git a/modules/bmw/src/main/java/com/bonus/bmw/person/entity/BasePersonBean.java b/modules/bmw/src/main/java/com/bonus/bmw/person/entity/BasePersonBean.java index a984043..087b633 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/person/entity/BasePersonBean.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/person/entity/BasePersonBean.java @@ -246,4 +246,7 @@ public class BasePersonBean { private List idNumberList; + @Excel(name = "务工类型 * ",required = true) + private String employmentTypes;//关键信息 务工类型 + } diff --git a/modules/bmw/src/main/java/com/bonus/bmw/person/service/BasePersonServiceImp.java b/modules/bmw/src/main/java/com/bonus/bmw/person/service/BasePersonServiceImp.java index c86fe09..5f7fc06 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/person/service/BasePersonServiceImp.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/person/service/BasePersonServiceImp.java @@ -223,6 +223,14 @@ public class BasePersonServiceImp implements BasePersonService{ if (u != null || b != null) { throw new IllegalArgumentException(c.getIdNumber() + "已存在或为黑名单"); } + + if(c.getEmploymentTypes().equals("本地务工(兰坪)")){ + c.setEmploymentTypes("0"); + }else if(c.getEmploymentTypes().equals("外地务工")){ + c.setEmploymentTypes("1"); + }else{ + throw new IllegalArgumentException(c.getEmploymentTypes()+"务工类型无法正确匹配，请正确填写！"); + } }); return list; } diff --git a/modules/bmw/src/main/java/com/bonus/bmw/salarystat/service/SalaryStatServiceImpl.java b/modules/bmw/src/main/java/com/bonus/bmw/salarystat/service/SalaryStatServiceImpl.java index e3e27b2..be23bd9 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/salarystat/service/SalaryStatServiceImpl.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/salarystat/service/SalaryStatServiceImpl.java @@ -460,8 +460,12 @@ public class SalaryStatServiceImpl implements SalaryStatService{ str[1], "1")); }); list.forEach(c->{ - c.setAttNum(String.valueOf(personSubContractList.stream().filter(k -> c.getSubContractId().equals(k.getContractId())). - mapToDouble(k -> Double.parseDouble(k.getAttDayNum())).sum())); + if(c.getPayMonth().equals("无发放")){ + c.setAttNum("0"); + }else{ + c.setAttNum(String.valueOf(personSubContractList.stream().filter(k -> c.getSubContractId().equals(k.getContractId())). + mapToDouble(k -> Double.parseDouble(k.getAttDayNum())).sum())); + } int grantSalaryNum = personSubContractList.stream().filter(k -> c.getSubContractId().equals(k.getContractId())). mapToInt(k -> salaryStatDao.selectSalaryByIdNumber(k.getIdNumber(), (String) request.getParams().get("startMonth"))).sum(); c.setGrantSalaryNum(grantSalaryNum + ""); diff --git a/modules/bmw/src/main/java/com/bonus/bmw/team/service/IntegratedQueryServiceImpl.java b/modules/bmw/src/main/java/com/bonus/bmw/team/service/IntegratedQueryServiceImpl.java index fd2dbcb..f066537 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/team/service/IntegratedQueryServiceImpl.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/team/service/IntegratedQueryServiceImpl.java @@ -249,9 +249,15 @@ public class IntegratedQueryServiceImpl implements IntegratedQueryService{ //计算考勤率 //1.0计算入场考勤率 if (punchCardBean.getEinPersonNum() > 0) { - double result = HighPrecisionUtil.divide(punchCardBean.getAttPersonNum(),punchCardBean.getEinPersonNum(),4); - String inPlaceAttRate = HighPrecisionUtil.multiply(result, 100,4)+"%"; - punchCardBean.setInPlaceAttRate(inPlaceAttRate); + if(punchCardBean.getAttPersonNum().equals(0)){ + punchCardBean.setInPlaceAttRate("0.00%"); + }else if(punchCardBean.getEinPersonNum().equals(0)){ + punchCardBean.setInPlaceAttRate("0.00%"); + }else{ + double result = HighPrecisionUtil.divide(punchCardBean.getAttPersonNum(),punchCardBean.getEinPersonNum(),4); + String inPlaceAttRate = HighPrecisionUtil.multiply(result, 100,4)+"%"; + punchCardBean.setInPlaceAttRate(inPlaceAttRate); + } } //2.0计算日计划考勤率 if (punchCardBean.getPlanPersonNum() > 0) { diff --git a/modules/bmw/src/main/java/com/bonus/bmw/whiteBlackList/service/ViolationBlackListServiceImpl.java b/modules/bmw/src/main/java/com/bonus/bmw/whiteBlackList/service/ViolationBlackListServiceImpl.java index 543c223..c959542 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/whiteBlackList/service/ViolationBlackListServiceImpl.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/whiteBlackList/service/ViolationBlackListServiceImpl.java @@ -232,7 +232,7 @@ public class ViolationBlackListServiceImpl implements ViolationBlackListService } // 导出标题 ExcelWriter writer = ExcelUtil.getWriter(true); - writer.merge(8, "违章黑名单"); + writer.merge(7, "违章黑名单"); writer.write(rows, true); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"); try { diff --git a/modules/bmw/src/main/resources/mapper/basic/OwnerMapper.xml b/modules/bmw/src/main/resources/mapper/basic/OwnerMapper.xml index fdfbf58..2111311 100644 --- a/modules/bmw/src/main/resources/mapper/basic/OwnerMapper.xml +++ b/modules/bmw/src/main/resources/mapper/basic/OwnerMapper.xml @@ -48,6 +48,7 @@ owner_phone like concat('%', #{params.keyWord}, '%') or `name` like concat('%', #{params.keyWord}, '%')) + GROUP BY update_time desc limit #{offset},#{limit} @@ -71,5 +72,6 @@ where is_active = '1' and `name` = #{name} and owner_name = #{ownerName} + and owner_phone = #{ownerPhone} \ No newline at end of file diff --git a/modules/bmw/src/main/resources/mapper/person/BasePersonMapper.xml b/modules/bmw/src/main/resources/mapper/person/BasePersonMapper.xml index 5da238c..0ea68c0 100644 --- a/modules/bmw/src/main/resources/mapper/person/BasePersonMapper.xml +++ b/modules/bmw/src/main/resources/mapper/person/BasePersonMapper.xml @@ -10,7 +10,7 @@ `sign_date`, `expiry_date`, `phone`, `cultrue`, `political_outlook`, `address_phone`, `post_id`, `person_type`, `worker_skill`, - `important_person`, `urgent_person`, `urgent_person_phone`) + `important_person`, `urgent_person`, `urgent_person_phone`,employment_type) values (#{params.idNumber},#{params.name},#{params.sex},#{params.ethnic}, @@ -18,7 +18,7 @@ #{params.signDate},#{params.expiryDate},#{params.phone}, #{params.cultrue},#{params.politicalOutlook},#{params.addressPhone}, #{params.postId}, #{params.personType},#{params.workerSkill},#{params.importantPerson}, - #{params.urgentPerson},#{params.urgentPersonPhone}) + #{params.urgentPerson},#{params.urgentPersonPhone},#{params.employmentTypes}) diff --git a/modules/bmw/src/main/resources/mapper/salary/SalaryBookFillMapper.xml b/modules/bmw/src/main/resources/mapper/salary/SalaryBookFillMapper.xml index 8910690..4f042b8 100644 --- a/modules/bmw/src/main/resources/mapper/salary/SalaryBookFillMapper.xml +++ b/modules/bmw/src/main/resources/mapper/salary/SalaryBookFillMapper.xml @@ -267,6 +267,7 @@ sbud.remark FROM salary_book_upload_details AS sbud WHERE sbud.salary_id = #{params.id} + and sbud.bank_number is not null AND sbud.bank_number!="" and sbud.bank_name is not null AND sbud.bank_name !="" and sbud.`name` like concat('%', #{params.keyWord}, '%') @@ -277,6 +278,7 @@ SELECT count(*) FROM salary_book_upload_details AS sbud WHERE sbud.salary_id = #{params.id} + and sbud.bank_number is not null AND sbud.bank_number!="" and sbud.bank_name is not null AND sbud.bank_name !="" and sbud.`name` like concat('%', #{params.keyWord}, '%') diff --git a/modules/bmw/src/main/resources/static/css/work/indexScreen/indexScreen.css b/modules/bmw/src/main/resources/static/css/work/indexScreen/indexScreen.css index 4c28e18..396cf67 100644 --- a/modules/bmw/src/main/resources/static/css/work/indexScreen/indexScreen.css +++ b/modules/bmw/src/main/resources/static/css/work/indexScreen/indexScreen.css @@ -537,7 +537,7 @@ html { background-color: #FDECD9; } #proInformationLevel{ - width: 40%; + width: 35%; } #proInformationLevel > .layui-row{ margin-top: 28px; diff --git a/modules/bmw/src/main/resources/static/downloads/人员库_导入模板.xlsx b/modules/bmw/src/main/resources/static/downloads/人员库_导入模板.xlsx index 5be1090..0ef997c 100644 Binary files a/modules/bmw/src/main/resources/static/downloads/人员库_导入模板.xlsx and b/modules/bmw/src/main/resources/static/downloads/人员库_导入模板.xlsx differ diff --git a/modules/bmw/src/main/resources/static/img/fileIcon/overlap.png b/modules/bmw/src/main/resources/static/img/fileIcon/overlap.png new file mode 100644 index 0000000..d63fe45 Binary files /dev/null and b/modules/bmw/src/main/resources/static/img/fileIcon/overlap.png differ diff --git a/modules/bmw/src/main/resources/static/js/work/ProjectManage/ownerManage.js b/modules/bmw/src/main/resources/static/js/work/ProjectManage/ownerManage.js index 672fa03..f4cba25 100644 --- a/modules/bmw/src/main/resources/static/js/work/ProjectManage/ownerManage.js +++ b/modules/bmw/src/main/resources/static/js/work/ProjectManage/ownerManage.js @@ -158,7 +158,7 @@ function view(id) { //新增 function addPorject() { var height = '350px'; - var width = '450px'; + var width = '480px'; var index = layer.open({ title: ['新增', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -193,7 +193,7 @@ function edit(id) { dataType: 'json', success: function (data) { var height = '350px'; - var width = '450px'; + var width = '480px'; var index = layer.open({ title: ['修改', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, diff --git a/modules/bmw/src/main/resources/static/js/work/ProjectManage/ownerManageForm.js b/modules/bmw/src/main/resources/static/js/work/ProjectManage/ownerManageForm.js index b702a09..711a7a8 100644 --- a/modules/bmw/src/main/resources/static/js/work/ProjectManage/ownerManageForm.js +++ b/modules/bmw/src/main/resources/static/js/work/ProjectManage/ownerManageForm.js @@ -63,6 +63,7 @@ function addProject(formData) { if (data.msg.indexOf("成功") != -1) { top.layer.close(addLoadingMsg); //再执行关闭 parent.layer.msg('保存成功', {icon: 1, time: 2000}); + setTimeout("reloading()", 2100); // parent.layer.closeAll(); } else if (data.msg.indexOf("失败") != -1) { top.layer.close(addLoadingMsg); //再执行关闭 @@ -71,7 +72,7 @@ function addProject(formData) { } else { top.layer.close(addLoadingMsg); //再执行关闭 parent.layer.msg(data.msg, {icon: 2, time: 2000}); - parent.layer.closeAll(); + // parent.layer.closeAll(); } }, error: function (XMLHttpRequest, textStatus, e) { diff --git a/modules/bmw/src/main/resources/static/js/work/SubManage/certificateFrom.js b/modules/bmw/src/main/resources/static/js/work/SubManage/certificateFrom.js index bbb09f6..d25c73e 100644 --- a/modules/bmw/src/main/resources/static/js/work/SubManage/certificateFrom.js +++ b/modules/bmw/src/main/resources/static/js/work/SubManage/certificateFrom.js @@ -25,27 +25,22 @@ $(function () { } // 验证成功后才会执行下面的操作 form.on('submit(formDemo)', function (data) { + var subId = $("#subId").val(); + if (subId == '' || subId == null){ + layer.msg('请选择分包名称', {icon: 2, time: 1500}) + return false; + } var id = $("#id").val(); if (id == '' || id == null) { - if (!$('#path')[0].files[0]) { - layer.msg("请上传文件！"); - return false; // 阻止表单提交 - }else{ - // 加载提示 - addLoadingMsg = top.layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0, shade: [0.8, '#393D49']}); - uploadFile(); - addProject(data); // 新增 - } + // 加载提示 + addLoadingMsg = top.layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0, shade: [0.8, '#393D49']}); + uploadFile(); + addProject(data); // 新增 }else { - if(filePath === null || filePath === ''){ - layer.msg("请上传文件！"); - return false; // 阻止表单提交 - }else{ - // 加载提示 - addLoadingMsg = top.layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0, shade: [0.8, '#393D49']}); - uploadFile(); - updateInfo(data); - } + // 加载提示 + addLoadingMsg = top.layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0, shade: [0.8, '#393D49']}); + uploadFile(); + updateInfo(data); } }); diff --git a/modules/bmw/src/main/resources/static/js/work/SubManage/certificateManage.js b/modules/bmw/src/main/resources/static/js/work/SubManage/certificateManage.js index bf19565..901c81d 100644 --- a/modules/bmw/src/main/resources/static/js/work/SubManage/certificateManage.js +++ b/modules/bmw/src/main/resources/static/js/work/SubManage/certificateManage.js @@ -112,9 +112,11 @@ function init() { var html = ""; if (path != null && path.indexOf("http") != -1){ html = "查看" - }else{ + }else if(path != null){ let rePath = fileUrl + "/" + path; html = "查看" + }else{ + html = "未上传" } return html; } diff --git a/modules/bmw/src/main/resources/static/js/work/SubManage/subBlackImport.js b/modules/bmw/src/main/resources/static/js/work/SubManage/subBlackImport.js index 264fcbb..44e95e2 100644 --- a/modules/bmw/src/main/resources/static/js/work/SubManage/subBlackImport.js +++ b/modules/bmw/src/main/resources/static/js/work/SubManage/subBlackImport.js @@ -19,6 +19,12 @@ $(function () { //批量-导入 function addInfo(formData) { + var fileInput = document.getElementById('file'); + if (fileInput.files.length === 0) { + // 如果没有选择文件，则弹出提示框 + layer.msg('请选择要上传的文件', {icon: 5}); + return false; + } var fileData = new FormData(); fileData.append('file', $('#file')[0].files[0]); // 加载提示 diff --git a/modules/bmw/src/main/resources/static/js/work/SubManage/subBlackManage.js b/modules/bmw/src/main/resources/static/js/work/SubManage/subBlackManage.js index f89fae6..ffe9a4a 100644 --- a/modules/bmw/src/main/resources/static/js/work/SubManage/subBlackManage.js +++ b/modules/bmw/src/main/resources/static/js/work/SubManage/subBlackManage.js @@ -186,7 +186,7 @@ function buttonDel(id, permission, pers) { // 导入 function fileImport(){ - var height = '150px'; + var height = '180px'; var width = '350px'; var index = layer.open({ title: ['导入', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], diff --git a/modules/bmw/src/main/resources/static/js/work/SubManage/subCertificateTypeFrom.js b/modules/bmw/src/main/resources/static/js/work/SubManage/subCertificateTypeFrom.js index 2c944c8..b56f575 100644 --- a/modules/bmw/src/main/resources/static/js/work/SubManage/subCertificateTypeFrom.js +++ b/modules/bmw/src/main/resources/static/js/work/SubManage/subCertificateTypeFrom.js @@ -47,6 +47,9 @@ function addProject(formData) { layer.alert(data.msg,{icon:1},()=>{ reloading(); }) + setTimeout(function () { + reloading(); + }, 2000); }else{ layer.alert(data.msg,{icon:2}) } @@ -77,6 +80,9 @@ function updateInfo(formData) { layer.alert(data.msg,{icon: 1},()=>{ reloading() }) + setTimeout(function () { + reloading(); + }, 2000); }else{ layer.alert(data.msg,{icon: 2}) } diff --git a/modules/bmw/src/main/resources/static/js/work/team/PersonByAttentionList.js b/modules/bmw/src/main/resources/static/js/work/team/PersonByAttentionList.js index 0c1dc12..7208e6b 100644 --- a/modules/bmw/src/main/resources/static/js/work/team/PersonByAttentionList.js +++ b/modules/bmw/src/main/resources/static/js/work/team/PersonByAttentionList.js @@ -129,8 +129,6 @@ function init() { html += "无"; } return html; - - return html; }, width: "8%" }, { diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.html b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.html index f42ddb5..3077751 100644 --- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.html +++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.html @@ -118,7 +118,7 @@ -
+
@@ -337,8 +337,7 @@
- +
diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.js b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.js index c37490b..049c424 100644 --- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.js +++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.js @@ -549,9 +549,9 @@ function baseInformationRequired(){ success: function (data) { if(data.code != '200'){ layer.alert(data.msg,{icon: 0}); - if(data.msg === idNumber + '已存在'){ - updateView(idNumber); - } + // if(data.msg === idNumber + '已存在'){ + // updateView(idNumber); + // } state = false; } } @@ -1517,6 +1517,7 @@ function addPerson(data, loadingMsg) { setTimeout(function() { layer.close(loadingMsg); // 关闭提示层 parent.layer.closeAll(); + window.parent.location.reload(); }, 5000); } else { layer.alert(data.msg); @@ -1553,7 +1554,7 @@ function getHoliday(value){ for (let i = 0; i < resultObj.length; i++) { let obj = { name : resultObj[i], - value : -1, + value : resultObj[i], selected : true }; values.push(obj); diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.html b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.html index 04090ee..0e26281 100644 --- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.html +++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.html @@ -102,7 +102,7 @@
-
+
@@ -311,8 +311,7 @@
- +
diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.js b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.js index 240caea..02ff23e 100644 --- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.js +++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.js @@ -1394,6 +1394,7 @@ function addPerson(data, loadingMsg) { setTimeout(function() { layer.close(loadingMsg); // 关闭提示层 parent.layer.closeAll(); + window.parent.location.reload(); }, 5000); // parent.layer.closeAll(); } else { @@ -1645,7 +1646,7 @@ function getHoliday(value){ for (let i = 0; i < resultObj.length; i++) { let obj = { name : resultObj[i], - value : -1, + value : resultObj[i], selected : true }; values.push(obj); diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.html b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.html index abc2915..9b333f9 100644 --- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.html +++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.html @@ -295,8 +295,7 @@
- +
diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.js b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.js index 6912671..3164fd7 100644 --- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.js +++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.js @@ -374,7 +374,7 @@ function getHoliday(value){ for (let i = 0; i < resultObj.length; i++) { let obj = { name : resultObj[i], - value : -1, + value : resultObj[i], selected : true }; values.push(obj); diff --git a/modules/bmw/src/main/resources/static/pages/work/ProjectManage/OwnerManageForm.html b/modules/bmw/src/main/resources/static/pages/work/ProjectManage/OwnerManageForm.html index 1f1fa32..ce711f6 100644 --- a/modules/bmw/src/main/resources/static/pages/work/ProjectManage/OwnerManageForm.html +++ b/modules/bmw/src/main/resources/static/pages/work/ProjectManage/OwnerManageForm.html @@ -54,7 +54,7 @@
- +
diff --git a/modules/bmw/src/main/resources/static/pages/work/SubManage/CertificateForm.html b/modules/bmw/src/main/resources/static/pages/work/SubManage/CertificateForm.html index fc08b7a..af3369e 100644 --- a/modules/bmw/src/main/resources/static/pages/work/SubManage/CertificateForm.html +++ b/modules/bmw/src/main/resources/static/pages/work/SubManage/CertificateForm.html @@ -48,7 +48,7 @@
-
@@ -72,7 +72,7 @@
- +
diff --git a/modules/bmw/src/main/resources/static/pages/work/SubManage/SubBlackForm.html b/modules/bmw/src/main/resources/static/pages/work/SubManage/SubBlackForm.html index d30b5e1..209a577 100644 --- a/modules/bmw/src/main/resources/static/pages/work/SubManage/SubBlackForm.html +++ b/modules/bmw/src/main/resources/static/pages/work/SubManage/SubBlackForm.html @@ -66,12 +66,12 @@
- +
- + diff --git a/modules/bmw/src/main/resources/static/pages/work/SubManage/SubBlackImport.html b/modules/bmw/src/main/resources/static/pages/work/SubManage/SubBlackImport.html index 58474d6..4f71a41 100644 --- a/modules/bmw/src/main/resources/static/pages/work/SubManage/SubBlackImport.html +++ b/modules/bmw/src/main/resources/static/pages/work/SubManage/SubBlackImport.html @@ -17,7 +17,7 @@
- + + +
+ + 项目参建单位项目数量排名TOP5 +
diff --git a/modules/file/src/main/java/com/bonus/file/upload/service/AttachmentService.java b/modules/file/src/main/java/com/bonus/file/upload/service/AttachmentService.java index 46d3f01..92a64a8 100644 --- a/modules/file/src/main/java/com/bonus/file/upload/service/AttachmentService.java +++ b/modules/file/src/main/java/com/bonus/file/upload/service/AttachmentService.java @@ -59,7 +59,7 @@ public class AttachmentService { if(os.toLowerCase().startsWith("win")){ //windows的目录 - imageFiles="D://yn/real_name/" + photoType + "/"; + imageFiles="E://yn/real_name/" + photoType + "/"; } String year = DateUtils.getNowYear(); String month = DateUtils.getNowMonths(); @@ -112,7 +112,7 @@ public class AttachmentService { String os = System.getProperty("os.name"); if(os.toLowerCase().startsWith("win")){ //windows的目录 - imageFiles="D://yn/real_name/" + photoType + "/"; + imageFiles="E://yn/real_name/" + photoType + "/"; } String year = DateUtils.getNowYear(); String month = DateUtils.getNowMonths();