Merge remote-tracking branch 'origin/master'

h5app/src/views/pages/jobhunt/detail.vue

@@ -60,6 +60,10 @@
             <ion-label>重点人员类别</ion-label>
             <ion-text>{{ dataModel.keyTypeName }}</ion-text>
           </div>
+          <div class="form-detail">
+            <ion-label>毕业日期</ion-label>
+            <ion-text>{{ dataModel.finishDate }}</ion-text>
+          </div>
           <div class="form-detail">
             <ion-label>求职人员标签</ion-label>
             <ion-text >{{ dataModel.tagName }}</ion-text>

src/main/java/com/hz/employmentsite/controller/jobUserManager/JobUserController.java

@@ -195,7 +195,7 @@ public class JobUserController {
         } else {
             ExcelHelper excelHelper = new ExcelHelper();
             ExcelHelper.ExcelData data = excelHelper.new ExcelData();
-            data.setTitles(Arrays.asList(new String[]{"序号", "姓名", "公民身份号码", "性别", "民族", "联系电话", "所属驿站", "年龄", "文化程度", "地址", "就业状态", "重点人员类别"}));
+            data.setTitles(Arrays.asList(new String[]{"序号", "姓名", "公民身份号码", "性别", "民族", "联系电话", "所属驿站", "年龄", "文化程度", "地址", "就业状态", "重点人员类别", "毕业日期"}));
             int i = 0;
             List<List<Object>> rowDatas = new ArrayList();
             for (JobUserVo item : result.getList()) {
@@ -213,6 +213,7 @@ public class JobUserController {
                 row.add(item.getAddress());
                 row.add(item.jobStatusName);
                 row.add(item.keyTypeName);
+                row.add(item.getFinishDate());
                 rowDatas.add(row);
             }
             data.setRows(rowDatas);

src/main/java/com/hz/employmentsite/services/impl/companyService/CompanyServiceImpl.java

@@ -150,7 +150,7 @@ public class CompanyServiceImpl implements CompanyService {
                             if(createSiteUserInfo.getUserNo().equals("0299999")||createSiteUserInfo.getUserNo().equals("202420648")){
                                 repeatData.setSiteID(data.getSiteID());
                                 pcCompanyMapper.updateByPrimaryKey(repeatData);
-                                return "0";
+                                return "-1";
                             }else{
                                 throw new  BaseException("1004","该企业已被"+curSiteInfo.getSiteName()+"，工号"+createSiteUserInfo.getUserNo()+"录入！");
                             }
@@ -180,7 +180,7 @@ public class CompanyServiceImpl implements CompanyService {
         }
         if (dbData == null) {
             //这里直接将公司转至当前驿站下
-            if(resultNum.equals(0)){
+            if(resultNum.equals(-1)){
                 result = 1;
             }
             else{

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobUserServiceImpl.java

@@ -783,6 +783,13 @@ public class JobUserServiceImpl implements JobUserService {
                         .findFirst().orElse(new SysDictionaryItem()).getValue());
                 if (item.getKeyPersonTypeID() == null || item.getKeyPersonTypeID() == 0)
                     errorInfo += "重点人员类别不存在!";
+                else {
+                    if(item.getKeyPersonTypeID().equals(2)&&stringUtils.IsNullOrEmpty(item.getFinishDate())){
+                        errorInfo += "应届高校毕业生必须填写毕业日期!";
+                    }else{
+                        item.setFinishDate(item.getFinishDate().substring(0,7));
+                    }
+                }
             }
 
             if (stringUtils.IsNullOrEmpty(item.getJobStatusName()))

vue/src/views/jobUserManager/jobuser/index.vue

@@ -233,6 +233,7 @@ export default defineComponent({
       {title: '年龄', dataIndex: 'age', key: 'age', align: "center"},
       {title: '就业状态', dataIndex: 'jobStatusName', key: 'jobStatusName', align: "center"},
       {title: '重点人员类别', dataIndex: 'keyTypeName', key: 'keyTypeName', align: "center"},
+      {title: '毕业日期', dataIndex: 'finishDate', key: 'finishDate', align: "center", isDefaultClose: true},
       {title: '民族', dataIndex: 'nationName', key: 'nationName', width: 80, align: "center", isDefaultClose: true},
       {title: '最高学历', dataIndex: 'cultureName', key: 'cultureName', align: "center", isDefaultClose: true},
       {title: '地址', dataIndex: 'address', key: 'address', align: "center", isDefaultClose: true},
@@ -261,6 +262,7 @@ export default defineComponent({
         {cnName: '地址', enName: 'address', width: 150},
         {cnName: '联系电话', enName: 'userMobile', width: 120},
         {cnName: '联系人', enName: 'userName', width: 100},
+        {cnName: '毕业日期', enName: 'finishDate', width: 100},
         {cnName: '籍贯', enName: 'nativePlace', width: 100},
         {cnName: '社会保障卡号', enName: 'socialSecurityCard', width: 150},
         {cnName: '毕业院校', enName: 'finishSchool', width: 150},