职业资格导入功能

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffCertificateService.java

@@ -125,6 +125,7 @@ public class WorkStaffCertificateService extends CrudService<WorkStaffCertificat
 	    List<String> nullUser = Lists.newArrayList();
 	    //该名称成员数量大于1
 	    List<String> multitudeUser = Lists.newArrayList();
+        List<String> multitudeHold = Lists.newArrayList();
 	    //该名称成员信息修改list
 	    List<String> updateUser = Lists.newArrayList();
 	    Map<String,String> updateMap = new HashMap();
@@ -138,9 +139,9 @@ public class WorkStaffCertificateService extends CrudService<WorkStaffCertificat
                     //将该成员名称添加到 没有该用户集合中
                     nullUser.add(entity.getUserName());
                 }else if(1 == userList.size()){
-                    entity.setStaffId(userList.get(0).getId());
+                    entity.setStaffId(userList.get(0).getAchiveId());
                     //根据 职业资格名称查询字典表并比对当前人员是否已添加该职业资格信息
-                    List<WorkStaffCertificate> certificateList = dao.getByUserId(userList.get(0).getId());
+                    List<WorkStaffCertificate> certificateList = dao.getByUserId(userList.get(0).getAchiveId());
                     for (WorkStaffCertificate certificate : certificateList) {
                         if(entity.getName().equals(certificate.getName())){
                             entity.setId(certificate.getId());
@@ -164,7 +165,10 @@ public class WorkStaffCertificateService extends CrudService<WorkStaffCertificat
                     }
                 }else{
                     //将该成员名称添加到 该名称成员数量大于1集合中
-                    multitudeUser.add(entity.getUserName());
+                    if(!multitudeUser.contains(entity.getUserName())){
+                        multitudeUser.add(entity.getUserName());
+                    }
+                    multitudeHold.add(entity.getUserName());
                 }
             }
         }
@@ -174,6 +178,7 @@ public class WorkStaffCertificateService extends CrudService<WorkStaffCertificat
         map.put("nullUser",nullUser);
         map.put("multitudeUser",multitudeUser);
         map.put("updateUser",updateUser);
+        map.put("multitudeHold",multitudeHold);
 	    return map;
     }
 

src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java

@@ -563,9 +563,10 @@ public class WorkStaffBasicInfoController extends BaseController {
 			Map<String, List<String>> listMap = workStaffCertificateService.saveByImport(listAll);
 			List<String> nullUser = listMap.get("nullUser");
 			List<String> multitudeUser = listMap.get("multitudeUser");
+			List<String> multitudeHold = listMap.get("multitudeHold");
 			List<String> updateUser = listMap.get("updateUser");
 			//计算新增和修改成功的数量（总量减去查无此人和人员数量超过1的数据量）
-			Integer successCount = listAll.size() -(nullUser.size() + multitudeUser.size());
+			Integer successCount = listAll.size() -(nullUser.size() + multitudeHold.size());
 			//处理成员名数量超过1人的数据
 			String multitudeStr = String.join("，", multitudeUser);
 			//处理修改信息的数据

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -1131,13 +1131,9 @@
                             <th class="hide"></th>
                             <th width="10%"><span class="require-item">*</span>证书名称</th>
                             <th width="10%"><span class="require-item">*</span>证书编号</th>
-                            <th width="10%"><span class="require-item">*</span>发证机关</th>
-                            <th width="11%"><span class="require-item">*</span>发证日期</th>
                             <th width="11%">注册日期</th>
-                            <th width="9%">注册证书编号</th>
-                            <th width="7%">专业</th>
-                            <th width="6%">等级</th>
-                            <th width="6%">取得方式</th>
+                            <th width="11%"><span class="require-item">*</span>发证日期</th>
+                            <th width="10%">发证机关</th>
                             <th width="10%">文件</th>
                             <th width="10%">操作</th>
                         </tr>
@@ -1162,31 +1158,17 @@
                                     <input id="certificateList${varStatus.index}_num" name="certificateList[${varStatus.index}].num" class="form-control required" value="${certificate.num}"/>
                                 </td>
                                 <td>
-                                    <input id="certificateList${varStatus.index}_issuingAuthority" name="certificateList[${varStatus.index}].issuingAuthority" class="form-control required" value="${certificate.issuingAuthority}"/>
-                                </td>
-                                <td>
-                                    <input id="certificateList${varStatus.index}_issuingDate" name="certificateList[${varStatus.index}].issuingDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate required"
-                                           value="<fmt:formatDate value="${certificate.issuingDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
-                                </td>
-                                <td>
                                     <input id="certificateList${varStatus.index}_registDate" name="certificateList[${varStatus.index}].registDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate"
                                            value="<fmt:formatDate value="${certificate.registDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                 </td>
                                 <td>
-                                    <input id="certificateList${varStatus.index}_registNum" name="certificateList[${varStatus.index}].registNum" class="form-control" value="${certificate.registNum}"/>
-                                </td>
-                                <td>
-                                    <input id="certificateList${varStatus.index}_major" name="certificateList[${varStatus.index}].major" class="form-control" value="${certificate.major}"/>
-                                </td>
-                                <td>
-                                    <input id="certificateList${varStatus.index}_grade" name="certificateList[${varStatus.index}].grade" class="form-control" value="${certificate.grade}"/>
+                                    <input id="certificateList${varStatus.index}_issuingDate" name="certificateList[${varStatus.index}].issuingDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate required"
+                                           value="<fmt:formatDate value="${certificate.issuingDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                 </td>
                                 <td>
-                                    <select name="certificateList[${varStatus.index}].issType" id="certificateList${varStatus.index}_issType" class="form-control">
-                                        <option value="考试" <c:if test="${'考试' eq certificate.issType}">selected</c:if>>考试</option>
-                                        <option value="考核" <c:if test="${'考核' eq certificate.issType}">selected</c:if>>考核</option>
-                                    </select>
+                                    <input id="certificateList${varStatus.index}_issuingAuthority" name="certificateList[${varStatus.index}].issuingAuthority" class="form-control" value="${certificate.issuingAuthority}"/>
                                 </td>
+
                                 <td class="text-left op-td">
                                     <a class="op-btn op-btn-add" title="上传" onclick="this_upload_file_button('certificateList${varStatus.index}_file')"><i class="fa fa-plus"></i>&nbsp;上传</a><span id="certificateList${varStatus.index}_fileName1"><c:if test="${not empty certificate.filePath}"><img src="${certificate.filePath}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${certificate.filePath}','90%','90%')" alt=""></c:if></span>
                                     <input id="certificateList${varStatus.index}_file" name="certificateList[${varStatus.index}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>
@@ -1200,56 +1182,41 @@
                     </table>
                     <script type="text/template" id="certificateTpl">//<!--
                             <tr>
-                            <td class="hide">
-                                <input type="hidden" id="certificateList{{idx}}_id" name="certificateList[{{idx}}].id" value="{{row.id}}">
-                                <input id="certificateList{{idx}}_delFlag" name="certificateList[{{idx}}].delFlag" type="hidden" value="0"/>
-                                <input id="certificateList{{idx}}_fileName" name="certificateList[{{idx}}].fileName" type="hidden" value="{{row.fileName}}"/>
-                                <input id="certificateList{{idx}}_filePath" name="certificateList[{{idx}}].filePath" type="hidden" value="{{row.filePath}}"/>
-                                </td>
-                                <td>
-                                <select name="certificateList[{{idx}}].name" id="certificateList{{idx}}_name" class="form-control required">
-                                <option value=""></option>
-                                <c:forEach items="${fns:getMainDictList('certificate_type')}" var="var">
-                                <option value="${var.label}">${var.label}</option>
-                            </c:forEach>
-                            </select>
-                            </td>
-                            <td>
-                            <input placeholder="请输入证书编号" id="certificateList{{idx}}_num" name="certificateList[{{idx}}].num" class="form-control required" value="{{row.num}}"/>
-                                </td>
-                                <td>
-                                <input placeholder="请输入发证机关" id="certificateList{{idx}}_issuingAuthority" name="certificateList[{{idx}}].issuingAuthority" class="form-control required" value="{{row.issuingAuthority}}"/>
-                                </td>
-                                <td>
-                                <input id="certificateList{{idx}}_issuingDate" name="certificateList[{{idx}}].issuingDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate required"
-                           style="background-color:#fff " placeholder="发证日期" value="<fmt:formatDate value="${certificate.issuingDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
+                                <td class="hide">
+                                    <input type="hidden" id="certificateList{{idx}}_id" name="certificateList[{{idx}}].id" value="{{row.id}}">
+                                    <input id="certificateList{{idx}}_delFlag" name="certificateList[{{idx}}].delFlag" type="hidden" value="0"/>
+                                    <input id="certificateList{{idx}}_fileName" name="certificateList[{{idx}}].fileName" type="hidden" value="{{row.fileName}}"/>
+                                    <input id="certificateList{{idx}}_filePath" name="certificateList[{{idx}}].filePath" type="hidden" value="{{row.filePath}}"/>
                                 </td>
                                 <td>
-                                <input id="certificateList{{idx}}_registDate" name="certificateList[{{idx}}].registDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate"
-                          style="background-color:#fff " placeholder="注册日期" value="<fmt:formatDate value="${certificate.registDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
+                                   <select name="certificateList[{{idx}}].name" id="certificateList{{idx}}_name" class="form-control required">
+                                        <option value=""></option>
+                                        <c:forEach items="${fns:getMainDictList('certificate_type')}" var="var">
+                                            <option value="${var.label}">${var.label}</option>
+                                        </c:forEach>
+                                    </select>
                                 </td>
                                 <td>
-                                <input placeholder="请输入注册证书编号" id="certificateList{{idx}}_registNum" name="certificateList[{{idx}}].registNum" class="form-control" value="{{row.registNum}}"/>
+                                    <input placeholder="请输入证书编号" id="certificateList{{idx}}_num" name="certificateList[{{idx}}].num" class="form-control required" value="{{row.num}}"/>
                                 </td>
                                 <td>
-                                <input placeholder="请输入专业" id="certificateList{{idx}}_major" name="certificateList[{{idx}}].major" class="form-control" value="{{row.major}}"/>
+                                    <input id="certificateList{{idx}}_registDate" name="certificateList[{{idx}}].registDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate"
+                                    style="background-color:#fff " placeholder="注册日期" value="<fmt:formatDate value="${certificate.registDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                 </td>
                                 <td>
-                                <input placeholder="请输入等级" id="certificateList{{idx}}_grade" name="certificateList[{{idx}}].grade" class="form-control" value="{{row.grade}}"/>
+                                    <input id="certificateList{{idx}}_issuingDate" name="certificateList[{{idx}}].issuingDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate required"
+                                    style="background-color:#fff " placeholder="发证日期" value="<fmt:formatDate value="${certificate.issuingDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                 </td>
                                 <td>
-                                <select name="certificateList[{{idx}}].issType" id="certificateList{{idx}}_issType" class="form-control">
-                                <option value="考试" selected >考试</option>
-                                <option value="考核">考核</option>
-                            </select>
-                            </td>
-                            <td class="text-center op-td">
-                                <a class="op-btn op-btn-add" title="上传" onclick="this_upload_file_button('certificateList{{idx}}_file')"><i class="fa fa-plus"></i>&nbsp;上传</a><span id="certificateList{{idx}}_fileName1"></span>
-                                <input id="certificateList{{idx}}_file" name="certificateList[{{idx}}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>
+                                    <input placeholder="请输入发证机关" id="certificateList{{idx}}_issuingAuthority" name="certificateList[{{idx}}].issuingAuthority" class="form-control" value="{{row.issuingAuthority}}"/>
                                 </td>
                                 <td class="text-center op-td">
-                                <a href=javascript:void(0); onclick="delRow(this, '#certificateList{{idx}}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
-                            </td>
+                                    <a class="op-btn op-btn-add" title="上传" onclick="this_upload_file_button('certificateList{{idx}}_file')"><i class="fa fa-plus"></i>&nbsp;上传</a><span id="certificateList{{idx}}_fileName1"></span>
+                                    <input id="certificateList{{idx}}_file" name="certificateList[{{idx}}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>
+                                    </td>
+                                    <td class="text-center op-td">
+                                    <a href=javascript:void(0); onclick="delRow(this, '#certificateList{{idx}}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
+                                </td>
                             </tr>//-->
                     </script>
                     <script type="text/javascript">