Browse Source

站点人员删除功能验证关联日志、任务是否存在
web-list页面删除功能的选中数据显示调整

liao-sea 10 months ago
parent
commit
d3d8491cb4
22 changed files with 182 additions and 91 deletions
  1. 48 37
      doc/就业驿站管理系统.pdm
  2. 8 2
      src/main/java/com/hz/employmentsite/controller/baseSettings/InstitutionController.java
  3. 8 2
      src/main/java/com/hz/employmentsite/controller/baseSettings/LabelController.java
  4. 7 1
      src/main/java/com/hz/employmentsite/controller/baseSettings/SiteInfoController.java
  5. 9 2
      src/main/java/com/hz/employmentsite/controller/baseSettings/SiteUserController.java
  6. 0 6
      src/main/java/com/hz/employmentsite/controller/companyService/PostController.java
  7. 7 1
      src/main/java/com/hz/employmentsite/controller/jobUserManager/JobFairsController.java
  8. 0 9
      src/main/java/com/hz/employmentsite/controller/jobUserManager/JobHuntController.java
  9. 2 1
      src/main/java/com/hz/employmentsite/controller/taskAndLog/DoTaskController.java
  10. 7 1
      src/main/java/com/hz/employmentsite/controller/taskAndLog/DoWorkController.java
  11. 18 6
      src/main/java/com/hz/employmentsite/services/impl/baseSettings/SiteUserImpl.java
  12. 9 3
      src/main/java/com/hz/employmentsite/services/impl/companyService/PostServiceImpl.java
  13. 6 0
      src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobHuntServiceImpl.java
  14. 3 2
      vue/src/views/baseSettings/institution/index.vue
  15. 3 2
      vue/src/views/baseSettings/siteInfo/index.vue
  16. 3 2
      vue/src/views/baseSettings/siteUser/index.vue
  17. 11 3
      vue/src/views/companyService/company/index.vue
  18. 11 2
      vue/src/views/companyService/post/index.vue
  19. 13 4
      vue/src/views/jobUserManager/jobhunt/index.vue
  20. 3 1
      vue/src/views/jobUserManager/jobuser/index.vue
  21. 3 2
      vue/src/views/taskAndLog/dotask/index.vue
  22. 3 2
      vue/src/views/taskAndLog/dowork/index.vue

+ 48 - 37
doc/就业驿站管理系统.pdm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{2D964471-9870-48BE-90E9-524D40D03B42}" Label="" LastModificationDate="1715393522" Name="就业驿站管理系统" Objects="651" Symbols="59" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.0.0.3514"?>
+<?PowerDesigner AppLocale="UTF16" ID="{2D964471-9870-48BE-90E9-524D40D03B42}" Label="" LastModificationDate="1717398118" Name="就业驿站管理系统" Objects="652" Symbols="59" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.0.0.3514"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -10942,8 +10942,8 @@ LABL 0 Arial,8,N</a:FontList>
 <a:Code>pc_recommend_mgt</a:Code>
 <a:CreationDate>1715223349</a:CreationDate>
 <a:Creator>bowin</a:Creator>
-<a:ModificationDate>1715223571</a:ModificationDate>
-<a:Modifier>bowin</a:Modifier>
+<a:ModificationDate>1717398118</a:ModificationDate>
+<a:Modifier>bowinuser</a:Modifier>
 <a:PhysicalOptions>ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:Columns>
@@ -11112,9 +11112,20 @@ LABL 0 Arial,8,N</a:FontList>
 <a:DataType>bit(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
+<o:Column Id="o564">
+<a:ObjectID>0E4605E2-5E14-4FE4-AD4F-8869D2D8EB65</a:ObjectID>
+<a:Name>remark</a:Name>
+<a:Code>remark</a:Code>
+<a:CreationDate>1717398080</a:CreationDate>
+<a:Creator>bowinuser</a:Creator>
+<a:ModificationDate>1717398118</a:ModificationDate>
+<a:Modifier>bowinuser</a:Modifier>
+<a:DataType>varchar(500)</a:DataType>
+<a:Length>500</a:Length>
+</o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o564">
+<o:Key Id="o565">
 <a:ObjectID>C6D28A3B-066E-4014-BF2E-0276879670AF</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -11126,7 +11137,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Column Ref="o550"/>
 </c:Key.Columns>
 </o:Key>
-<o:Key Id="o565">
+<o:Key Id="o566">
 <a:ObjectID>178A181D-71CB-4229-B452-F8E362110F3C</a:ObjectID>
 <a:Name>pc_recommend_mgt_PostID</a:Name>
 <a:Code>pc_recommend_mgt_PostID</a:Code>
@@ -11139,7 +11150,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Column Ref="o551"/>
 </c:Key.Columns>
 </o:Key>
-<o:Key Id="o566">
+<o:Key Id="o567">
 <a:ObjectID>41D85F31-710D-4AC1-B803-908514B4BE11</a:ObjectID>
 <a:Name>pc_recommend_mgt_JobHuntID</a:Name>
 <a:Code>pc_recommend_mgt_JobHuntID</a:Code>
@@ -11154,7 +11165,7 @@ LABL 0 Arial,8,N</a:FontList>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o564"/>
+<o:Key Ref="o565"/>
 </c:PrimaryKey>
 </o:Table>
 </c:Tables>
@@ -11180,7 +11191,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o158"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o567">
+<o:ReferenceJoin Id="o568">
 <a:ObjectID>54F04187-9C05-49AC-A2AE-0F6805B87FA6</a:ObjectID>
 <a:CreationDate>1700727651</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11216,7 +11227,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o140"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o568">
+<o:ReferenceJoin Id="o569">
 <a:ObjectID>1C1F4C11-0B3A-4093-A82E-6A9FD4FD25D0</a:ObjectID>
 <a:CreationDate>1700727797</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11252,7 +11263,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o140"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o569">
+<o:ReferenceJoin Id="o570">
 <a:ObjectID>40A0CA90-8614-4815-97AD-0EBD6F0B71D9</a:ObjectID>
 <a:CreationDate>1700730987</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11288,7 +11299,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o140"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o570">
+<o:ReferenceJoin Id="o571">
 <a:ObjectID>FB4FAA07-CE83-4FCA-A8D0-3EAF2B4D6E07</a:ObjectID>
 <a:CreationDate>1700731007</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11324,7 +11335,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o202"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o571">
+<o:ReferenceJoin Id="o572">
 <a:ObjectID>D517805A-E4C7-4403-8465-67312BEA0D62</a:ObjectID>
 <a:CreationDate>1700731026</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11360,7 +11371,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o326"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o572">
+<o:ReferenceJoin Id="o573">
 <a:ObjectID>7A61F341-556C-4479-A342-A7646603F9F3</a:ObjectID>
 <a:CreationDate>1700731151</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11396,7 +11407,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o268"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o573">
+<o:ReferenceJoin Id="o574">
 <a:ObjectID>690001A1-24C5-4BB0-860C-27E191E15580</a:ObjectID>
 <a:CreationDate>1700731191</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11432,7 +11443,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o140"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o574">
+<o:ReferenceJoin Id="o575">
 <a:ObjectID>0B8B962D-B921-4C57-9B91-8C15F33BED75</a:ObjectID>
 <a:CreationDate>1700731590</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11468,7 +11479,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o326"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o575">
+<o:ReferenceJoin Id="o576">
 <a:ObjectID>CF00EFE5-091D-4B44-9BC6-78E0E41801E0</a:ObjectID>
 <a:CreationDate>1700731650</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11504,7 +11515,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o326"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o576">
+<o:ReferenceJoin Id="o577">
 <a:ObjectID>451F9C5E-5174-4834-8447-8BFBF152415E</a:ObjectID>
 <a:CreationDate>1700731691</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11540,7 +11551,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o326"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o577">
+<o:ReferenceJoin Id="o578">
 <a:ObjectID>348ADE0B-66DB-4664-989D-92DEC0AF1BCD</a:ObjectID>
 <a:CreationDate>1700731736</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11576,7 +11587,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o268"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o578">
+<o:ReferenceJoin Id="o579">
 <a:ObjectID>ABE69D56-EB12-409A-94E0-7250DB96B800</a:ObjectID>
 <a:CreationDate>1700731802</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11612,7 +11623,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o326"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o579">
+<o:ReferenceJoin Id="o580">
 <a:ObjectID>08EDE705-0BB1-4605-9A44-22080589321A</a:ObjectID>
 <a:CreationDate>1700731807</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11648,7 +11659,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o416"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o580">
+<o:ReferenceJoin Id="o581">
 <a:ObjectID>9948DA1B-7F6D-4BFD-944D-78B0BB942C79</a:ObjectID>
 <a:CreationDate>1701227667</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11684,7 +11695,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o228"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o581">
+<o:ReferenceJoin Id="o582">
 <a:ObjectID>B70423BB-9802-457F-AE23-4CBF7D842F4E</a:ObjectID>
 <a:CreationDate>1701660221</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11717,7 +11728,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Table Ref="o105"/>
 </c:ChildTable>
 <c:Joins>
-<o:ReferenceJoin Id="o582">
+<o:ReferenceJoin Id="o583">
 <a:ObjectID>5E4AB2FC-A524-45F4-9FE1-E46F2AFC9564</a:ObjectID>
 <a:CreationDate>1701661219</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11753,7 +11764,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o140"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o583">
+<o:ReferenceJoin Id="o584">
 <a:ObjectID>3629C8A8-9FDA-42D0-825C-8B0997759790</a:ObjectID>
 <a:CreationDate>1701934197</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11789,7 +11800,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o442"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o584">
+<o:ReferenceJoin Id="o585">
 <a:ObjectID>2374EDD3-256A-4744-B800-C1EAC2B3A8BA</a:ObjectID>
 <a:CreationDate>1703661458</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11825,7 +11836,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o475"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o585">
+<o:ReferenceJoin Id="o586">
 <a:ObjectID>E869B4C1-58EF-4215-B2EE-702BC081782A</a:ObjectID>
 <a:CreationDate>1703661902</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11861,7 +11872,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o268"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o586">
+<o:ReferenceJoin Id="o587">
 <a:ObjectID>9CCCDB43-37CB-4FEC-9728-5E1C604B931C</a:ObjectID>
 <a:CreationDate>1703727031</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11897,7 +11908,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o486"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o587">
+<o:ReferenceJoin Id="o588">
 <a:ObjectID>69BDF72C-5720-4C82-887C-A74DF7E2A01D</a:ObjectID>
 <a:CreationDate>1713147069</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -11933,7 +11944,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o503"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o588">
+<o:ReferenceJoin Id="o589">
 <a:ObjectID>EA16D89A-A814-4871-B1D9-CCB394F38D05</a:ObjectID>
 <a:CreationDate>1713443051</a:CreationDate>
 <a:Creator>bowin90</a:Creator>
@@ -11969,7 +11980,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o518"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o589">
+<o:ReferenceJoin Id="o590">
 <a:ObjectID>2E9E9C15-5A07-4183-B3CA-14FCC8C8168E</a:ObjectID>
 <a:CreationDate>1714093624</a:CreationDate>
 <a:Creator>bowin90</a:Creator>
@@ -12005,7 +12016,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o533"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o590">
+<o:ReferenceJoin Id="o591">
 <a:ObjectID>CC1C7DA2-5BEE-4DB2-A044-4F4FBF279739</a:ObjectID>
 <a:CreationDate>1715215782</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -12041,7 +12052,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o543"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o591">
+<o:ReferenceJoin Id="o592">
 <a:ObjectID>23841A96-C9A6-4ABB-AFA8-AAA335CB47C3</a:ObjectID>
 <a:CreationDate>1715219939</a:CreationDate>
 <a:Creator>bowin</a:Creator>
@@ -12077,7 +12088,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o543"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o592">
+<o:ReferenceJoin Id="o593">
 <a:ObjectID>BC3215F6-6973-4562-A800-0E80C50D173B</a:ObjectID>
 <a:CreationDate>1715220075</a:CreationDate>
 <a:Creator>bowin</a:Creator>
@@ -12113,7 +12124,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o543"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o593">
+<o:ReferenceJoin Id="o594">
 <a:ObjectID>5F31127D-2B80-48BF-BFA0-78B647F27176</a:ObjectID>
 <a:CreationDate>1715220075</a:CreationDate>
 <a:Creator>bowin</a:Creator>
@@ -12149,7 +12160,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o486"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o594">
+<o:ReferenceJoin Id="o595">
 <a:ObjectID>B51951A4-8BCB-4AC9-92C2-91C846828B2E</a:ObjectID>
 <a:CreationDate>1715391325</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -12166,7 +12177,7 @@ LABL 0 Arial,8,N</a:FontList>
 </o:Reference>
 </c:References>
 <c:DefaultGroups>
-<o:Group Id="o595">
+<o:Group Id="o596">
 <a:ObjectID>9EC8D640-B68B-4B22-9ECC-8604531BD893</a:ObjectID>
 <a:Name>PUBLIC</a:Name>
 <a:Code>PUBLIC</a:Code>
@@ -12177,7 +12188,7 @@ LABL 0 Arial,8,N</a:FontList>
 </o:Group>
 </c:DefaultGroups>
 <c:TargetModels>
-<o:TargetModel Id="o596">
+<o:TargetModel Id="o597">
 <a:ObjectID>F5495246-0AD0-47FB-87F5-4932E41412CF</a:ObjectID>
 <a:Name>MySQL 5.0</a:Name>
 <a:Code>MYSQL50</a:Code>

+ 8 - 2
src/main/java/com/hz/employmentsite/controller/baseSettings/InstitutionController.java

@@ -1,6 +1,8 @@
 package com.hz.employmentsite.controller.baseSettings;
 
 import com.github.pagehelper.PageInfo;
+import com.hz.employmentsite.filter.exception.BaseErrorEnum;
+import com.hz.employmentsite.filter.exception.BaseException;
 import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.model.SelectProps;
@@ -93,8 +95,12 @@ public class InstitutionController {
 
     @ResponseBody
     @PostMapping("/delete")
-    public BaseResponse<Integer> delete(@RequestBody List<String> idList){
-        return RespGenerstor.success(institutionService.delete(idList));
+    public BaseResponse<Integer> delete(@RequestBody List<String> idList){ 
+        var result = institutionService.delete(idList);
+        if (result <= 0) {
+            throw new BaseException(BaseErrorEnum.DELETE_NOT_DATA_ERROR);
+        }
+        return RespGenerstor.success(result);
     }
 
 

+ 8 - 2
src/main/java/com/hz/employmentsite/controller/baseSettings/LabelController.java

@@ -1,6 +1,8 @@
 package com.hz.employmentsite.controller.baseSettings;
 
 import com.github.pagehelper.PageInfo;
+import com.hz.employmentsite.filter.exception.BaseErrorEnum;
+import com.hz.employmentsite.filter.exception.BaseException;
 import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.model.PcLabel;
@@ -51,7 +53,11 @@ public class LabelController {
 
     @ResponseBody
     @PostMapping("/delete")
-    public BaseResponse<Integer> delete(@RequestBody List<String> idList){
-        return RespGenerstor.success(labelService.delete(idList));
+    public BaseResponse<Integer> delete(@RequestBody List<String> idList){ 
+        var result = labelService.delete(idList);
+        if (result <= 0) {
+            throw new BaseException(BaseErrorEnum.DELETE_NOT_DATA_ERROR);
+        }
+        return RespGenerstor.success(result);
     }
 }

+ 7 - 1
src/main/java/com/hz/employmentsite/controller/baseSettings/SiteInfoController.java

@@ -1,6 +1,8 @@
 package com.hz.employmentsite.controller.baseSettings;
 
 import com.github.pagehelper.PageInfo;
+import com.hz.employmentsite.filter.exception.BaseErrorEnum;
+import com.hz.employmentsite.filter.exception.BaseException;
 import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.model.SelectProps;
@@ -113,7 +115,11 @@ public class SiteInfoController {
     @ResponseBody
     @PostMapping("/delete")
     public BaseResponse<Integer> delete(@RequestBody List<String> idList){
-        return RespGenerstor.success(siteInfoService.delete(idList));
+        var result = siteInfoService.delete(idList);
+        if (result <= 0) {
+            throw new BaseException(BaseErrorEnum.DELETE_NOT_DATA_ERROR);
+        }
+        return RespGenerstor.success(result);
     }
 
 

+ 9 - 2
src/main/java/com/hz/employmentsite/controller/baseSettings/SiteUserController.java

@@ -2,9 +2,12 @@ package com.hz.employmentsite.controller.baseSettings;
 
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.filter.exception.BaseErrorEnum;
+import com.hz.employmentsite.filter.exception.BaseException;
 import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
-import com.hz.employmentsite.model.SelectProps;
+import com.hz.employmentsite.mapper.PcDotaskUserMapper;
+import com.hz.employmentsite.mapper.PcDoworkMapper;
+import com.hz.employmentsite.model.*;
 import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.services.service.baseSettings.SiteUserService;
 import com.hz.employmentsite.util.ExcelHelper;
@@ -121,7 +124,11 @@ public class SiteUserController {
     @ResponseBody
     @PostMapping("/delete")
     public BaseResponse<Integer> delete(@RequestBody List<String> idList) {
-        return RespGenerstor.success(userInfoService.delete(idList));
+        var result = userInfoService.delete(idList);
+        if (result <= 0) {
+            throw new BaseException(BaseErrorEnum.DELETE_NOT_DATA_ERROR);
+        }
+        return RespGenerstor.success(result);
     }
 
     @PostMapping("/importSiteUser")

+ 0 - 6
src/main/java/com/hz/employmentsite/controller/companyService/PostController.java

@@ -128,12 +128,6 @@ public class PostController {
     @ResponseBody
     @PostMapping("/delete")
     public BaseResponse<Integer> delete(@RequestBody List<String> idList) {
-        PcRecommendMgtExample recommendMgtExp = new PcRecommendMgtExample();
-        recommendMgtExp.or().andPostIDIn(idList);
-        List<PcRecommendMgt> resultList = pcRecommendMgtMapper.selectByExample(recommendMgtExp).stream().toList();
-        if( resultList.size() > 0 ) {
-            throw new BaseException("1004","已存在该岗位的推荐数据,删除失败!");
-        }
         var result = postService.delete(idList);
         if (result <= 0) {
             throw new BaseException(BaseErrorEnum.DELETE_NOT_DATA_ERROR);

+ 7 - 1
src/main/java/com/hz/employmentsite/controller/jobUserManager/JobFairsController.java

@@ -1,6 +1,8 @@
 package com.hz.employmentsite.controller.jobUserManager;
 
 import com.github.pagehelper.PageInfo;
+import com.hz.employmentsite.filter.exception.BaseErrorEnum;
+import com.hz.employmentsite.filter.exception.BaseException;
 import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.services.service.AccountService;
@@ -50,6 +52,10 @@ public class JobFairsController {
     @ResponseBody
     @PostMapping("/delete")
     public BaseResponse<Integer> delete(@RequestBody List<String> idList) {
-        return RespGenerstor.success(jobFairsService.deleteByIds(idList));
+        var result = jobFairsService.deleteByIds(idList);
+        if (result <= 0) {
+            throw new BaseException(BaseErrorEnum.DELETE_NOT_DATA_ERROR);
+        }
+        return RespGenerstor.success(result);
     }
 }

+ 0 - 9
src/main/java/com/hz/employmentsite/controller/jobUserManager/JobHuntController.java

@@ -30,9 +30,6 @@ public class JobHuntController {
     @Autowired
     private JobHuntService jobhuntService;
 
-    @Autowired
-    private PcRecommendMgtMapper pcRecommendMgtMapper;
-
     @Autowired
     private ExcelHelper excelHelper;
 
@@ -81,12 +78,6 @@ public class JobHuntController {
     @ResponseBody
     @PostMapping("/delete")
     public BaseResponse<Integer> delete(@RequestBody List<String> idList){
-        PcRecommendMgtExample recommendMgtExp = new PcRecommendMgtExample();
-        recommendMgtExp.or().andJobHuntIDIn(idList);
-        List<PcRecommendMgt> resultList = pcRecommendMgtMapper.selectByExample(recommendMgtExp).stream().toList();
-        if( resultList.size() > 0 ) {
-            throw new BaseException("1004","已存在该意向的推荐数据,删除失败!");
-        }
         var result = jobhuntService.delete(idList);
         if (result <= 0) {
             throw new BaseException(BaseErrorEnum.DELETE_NOT_DATA_ERROR);

+ 2 - 1
src/main/java/com/hz/employmentsite/controller/taskAndLog/DoTaskController.java

@@ -99,8 +99,9 @@ public class DoTaskController {
     @PostMapping("/delete")
     public BaseResponse delete(@RequestBody List<String> ids) {
         int result = doTaskService.delete(ids);
-        if (result <= 0)
+        if (result <= 0){
             throw new BaseException(BaseErrorEnum.DELETE_NOT_DATA_ERROR);
+        }
         return RespGenerstor.success(result);
     }
 

+ 7 - 1
src/main/java/com/hz/employmentsite/controller/taskAndLog/DoWorkController.java

@@ -1,6 +1,8 @@
 package com.hz.employmentsite.controller.taskAndLog;
 
 import com.github.pagehelper.PageInfo;
+import com.hz.employmentsite.filter.exception.BaseErrorEnum;
+import com.hz.employmentsite.filter.exception.BaseException;
 import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.mapper.PcSiteMapper;
@@ -124,7 +126,11 @@ public class DoWorkController {
     @ResponseBody
     @PostMapping("/delete")
     public BaseResponse<Integer> delete(@RequestBody List<String> idList){
-        return RespGenerstor.success(doWorkService.delete(idList));
+        int result = doWorkService.delete(idList);
+        if (result <= 0){
+            throw new BaseException(BaseErrorEnum.DELETE_NOT_DATA_ERROR);
+        }
+        return RespGenerstor.success(result);
     }
 
     /**

+ 18 - 6
src/main/java/com/hz/employmentsite/services/impl/baseSettings/SiteUserImpl.java

@@ -42,12 +42,12 @@ public class SiteUserImpl implements SiteUserService {
 
     @Autowired
     private PcSiteUserMapper pcSiteUserMapper;
-
+ 
     @Autowired
-    private SysUserMapper sysUserMapper;
+    private PcDoworkMapper pcDoworkMapper;
 
     @Autowired
-    private SysRoleMapper sysRoleMapper;
+    private PcDotaskUserMapper pcDotaskUserMapper;
 
     @Autowired
     private SysUserSysRoleMapper sysUserSysRoleMapper;
@@ -271,18 +271,30 @@ public class SiteUserImpl implements SiteUserService {
     @Override
     public Integer delete(List<String> idList){
         int result = 0;
+        PcDoworkExample workSiteUserExp = new PcDoworkExample();
+        workSiteUserExp.or().andSiteUserIDIn(idList);
+        List<PcDowork> resultList1 = pcDoworkMapper.selectByExample(workSiteUserExp).stream().toList();
+        if( resultList1.size() > 0 ) {
+            throw new BaseException("10004","已存在该驿站人员的工作日志,删除失败!");
+        }
+        PcDotaskUserExample taskSiteUserExp = new PcDotaskUserExample();
+        taskSiteUserExp.or().andSiteUserIDIn(idList);
+        List<PcDotaskUser> resultList2 = pcDotaskUserMapper.selectByExample(taskSiteUserExp).stream().toList();
+        if( resultList2.size() > 0 ) {
+            throw new BaseException("10004","已存在该驿站人员的工作任务,删除失败!");
+        }
         PcSiteUserExample siteUserExp = new PcSiteUserExample();
         siteUserExp.or().andSiteUserIDIn(idList);
         var curSiteUserList = pcSiteUserMapper.selectByExample(siteUserExp).stream().toList();
-        result += pcSiteUserMapper.deleteByExample(siteUserExp);
         if (curSiteUserList != null && curSiteUserList.size() > 0){
             for(PcSiteUser curSiteUser : curSiteUserList) {
                 SysUserSysRoleExample userRoleExp = new SysUserSysRoleExample();
                 userRoleExp.or().andUserIDEqualTo(curSiteUser.getUserID());
                 result += sysUserSysRoleMapper.deleteByExample(userRoleExp);
-                SysUserExample userExp = new SysUserExample();
-                userExp.or().andUserIDEqualTo(curSiteUser.getUserID());
+                //SysUserExample userExp = new SysUserExample();
+                //userExp.or().andUserIDEqualTo(curSiteUser.getUserID());
                 /*result += sysUserMapper.deleteByExample(userExp);*/
+                result += pcSiteUserMapper.deleteByPrimaryKey(curSiteUser.getSiteUserID());
             }
         }
         return result;

+ 9 - 3
src/main/java/com/hz/employmentsite/services/impl/companyService/PostServiceImpl.java

@@ -307,14 +307,20 @@ public class PostServiceImpl implements PostService {
 
 
     @Override
-    public int delete(List<String> ids) {
+    public int delete(List<String> idList) {
         int result = 0;
+        PcRecommendMgtExample recommendMgtExp = new PcRecommendMgtExample();
+        recommendMgtExp.or().andPostIDIn(idList);
+        List<PcRecommendMgt> resultList = pcRecommendMgtMapper.selectByExample(recommendMgtExp).stream().toList();
+        if( resultList.size() > 0 ) {
+            throw new BaseException("10004","已存在该岗位的推荐数据,删除失败!");
+        }
         PcPostExample postExp = new PcPostExample();
-        postExp.or().andPostIDIn(ids);
+        postExp.or().andPostIDIn(idList);
         result = pcPostMapper.deleteByExample(postExp);
         if (result > 0) {
             PcLabelPostExample labelEmp = new PcLabelPostExample();
-            labelEmp.or().andPostIDIn(ids);
+            labelEmp.or().andPostIDIn(idList);
             pcLabelPostMapper.deleteByExample(labelEmp);
         }
         return result;

+ 6 - 0
src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobHuntServiceImpl.java

@@ -97,6 +97,12 @@ public class JobHuntServiceImpl implements JobHuntService {
 
     @Override
     public Integer delete(List<String> idList){
+        PcRecommendMgtExample recommendMgtExp = new PcRecommendMgtExample();
+        recommendMgtExp.or().andJobHuntIDIn(idList);
+        List<PcRecommendMgt> resultList = pcRecommendMgtMapper.selectByExample(recommendMgtExp).stream().toList();
+        if( resultList.size() > 0 ) {
+            throw new BaseException("10004","已存在该意向的推荐数据,删除失败!");
+        }
         PcJobhuntExample contactExample = new PcJobhuntExample();
         contactExample.or().andJobHuntIDIn(idList);
         pcJobhuntMapper.deleteByExample(contactExample);

+ 3 - 2
vue/src/views/baseSettings/institution/index.vue

@@ -166,8 +166,9 @@ export default defineComponent({
     }
 
     const onDel= (item: any) => {
+      formState.selectedRowKeys = [];
       if (item) {
-        formState.selectedRowKeys.push(item.institutionID as never)
+        formState.selectedRowKeys.push(item.institutionID as never);
       }
 
       if (formState.selectedRowKeys.length <= 0) {
@@ -189,7 +190,7 @@ export default defineComponent({
           });
         },
         onCancel() {
-
+          formState.selectedRowKeys=[];
         },
       });
     };

+ 3 - 2
vue/src/views/baseSettings/siteInfo/index.vue

@@ -233,8 +233,9 @@ export default defineComponent({
     }
 
     const onDel= (item: any) => {
+      formState.selectedRowKeys = [];
       if (item) {
-        formState.selectedRowKeys.push(item.siteID as never)
+        formState.selectedRowKeys.push(item.siteID as never);
       }
 
       if (formState.selectedRowKeys.length <= 0) {
@@ -256,7 +257,7 @@ export default defineComponent({
           });
         },
         onCancel() {
-
+          formState.selectedRowKeys = [];
         },
       });
     };

+ 3 - 2
vue/src/views/baseSettings/siteUser/index.vue

@@ -238,6 +238,7 @@ export default defineComponent({
     }
 
     const onDel= (item: any) => {
+      formState.selectedRowKeys = [];
       if (item) {
         formState.selectedRowKeys.push(item.siteUserID as never)
       }
@@ -248,7 +249,7 @@ export default defineComponent({
       }
 
       Modal.confirm({
-        title: '确认删除选中的人员信息?',
+        title: '确认删除选中的站点人员?',
         icon: createVNode(ExclamationCircleOutlined),
         content: '',
         okText: '确认删除',
@@ -261,7 +262,7 @@ export default defineComponent({
           });
         },
         onCancel() {
-
+          formState.selectedRowKeys = [];
         },
       });
     };

+ 11 - 3
vue/src/views/companyService/company/index.vue

@@ -147,7 +147,7 @@
 import {computed, createVNode, defineComponent, reactive, ref} from 'vue';
 import {DownOutlined, ExclamationCircleOutlined, UpOutlined} from '@ant-design/icons-vue';
 import type {FormInstance, TableProps} from 'ant-design-vue';
-import {Modal, SelectProps} from "ant-design-vue";
+import {message, Modal, SelectProps} from "ant-design-vue";
 import {del, getList} from '@/api/companyService/company';
 import BExportExcel from "@/components/basic/excel/exportExcel/exportExcel.vue";
 import BImportExcel from '@/components/basic/excel/importExcel/importExcel.vue';
@@ -379,6 +379,14 @@ export default defineComponent({
     }
 
     const onDel = (item: any) => {
+      formState.selectedRowKeys = [];
+      if (item) {
+        formState.selectedRowKeys.push(item.companyID as never);
+      }
+      if (formState.selectedRowKeys.length <= 0) {
+        message.warning('请选择需要删除的数据!');
+        return false;
+      }
       Modal.confirm({
         title: '确认删除选中的企业信息?',
         icon: createVNode(ExclamationCircleOutlined),
@@ -388,12 +396,12 @@ export default defineComponent({
         okButtonProps: {},
         cancelText: '取消',
         onOk() {
-          del([item.companyID]).then(() => {
+          del(formState.selectedRowKeys).then(() => {
             loadData();
           });
         },
         onCancel() {
-
+          formState.selectedRowKeys = [];
         },
       });
     };

+ 11 - 2
vue/src/views/companyService/post/index.vue

@@ -353,8 +353,16 @@ export default defineComponent({
     }
 
     const onDel = (item: any) => {
+      formState.selectedRowKeys = [];
+      if (item) {
+        formState.selectedRowKeys.push(item.postID as never);
+      }
+      if (formState.selectedRowKeys.length <= 0) {
+        message.warning('请选择需要删除的数据!');
+        return false;
+      }
       Modal.confirm({
-        title: '确认删除该岗位信息?',
+        title: '确认删除选中的岗位信息?',
         icon: createVNode(ExclamationCircleOutlined),
         content: '',
         okText: '确认删除',
@@ -362,11 +370,12 @@ export default defineComponent({
         okButtonProps: {},
         cancelText: '取消',
         onOk() {
-          del([item.postID]).then(() => {
+          del(formState.selectedRowKeys).then(() => {
             loadData();
           });
         },
         onCancel() {
+          formState.selectedRowKeys = [];
         },
       })
     };

+ 13 - 4
vue/src/views/jobUserManager/jobhunt/index.vue

@@ -187,7 +187,7 @@
 <script lang="ts">
 import {computed, createVNode, defineComponent, reactive, ref} from 'vue';
 import type {FormInstance, SelectProps, TableProps} from 'ant-design-vue';
-import {Modal} from "ant-design-vue";
+import {message, Modal} from "ant-design-vue";
 import {delJobHunt, getJobHuntList} from '@/api/jobUserManager/jobhunt';
 import {getSysDictionaryList} from '@/api/system/dictionary';
 import {getPaginationTotalTitle} from '@/utils/common';
@@ -341,8 +341,16 @@ export default defineComponent({
     }
 
     const onDel = (item: any) => {
+      formState.selectedRowKeys = [];
+      if (item) {
+        formState.selectedRowKeys.push(item.jobHuntID as never)
+      }
+      if (formState.selectedRowKeys.length <= 0) {
+        message.warning('请选择需要删除的数据!');
+        return false;
+      }
       Modal.confirm({
-        title: '确认删除该求职意向?',
+        title: '确认删除选中的求职意向?',
         icon: createVNode(ExclamationCircleOutlined),
         content: '',
         okText: '确认删除',
@@ -350,11 +358,12 @@ export default defineComponent({
         okButtonProps: {},
         cancelText: '取消',
         onOk() {
-          delJobHunt([item.jobHuntID]).then(() => {
+          delJobHunt(formState.selectedRowKeys).then(() => {
             loadData();
           });
         },
-        onCancel() { 
+        onCancel() {
+          formState.selectedRowKeys = [];
         },
       });
     };

+ 3 - 1
vue/src/views/jobUserManager/jobuser/index.vue

@@ -378,6 +378,7 @@ export default defineComponent({
     };
 
     const onDel = (item: any) => {
+      formState.selectedRowKeys = [];
       if (item) {
         formState.selectedRowKeys.push(item.jobUserID as never)
       }
@@ -387,7 +388,7 @@ export default defineComponent({
         return false;
       }
       Modal.confirm({
-        title: '确认删除?',
+        title: '确认删除选择的求职人员?',
         icon: createVNode(ExclamationCircleOutlined),
         content: '',
         okText: '确认删除',
@@ -400,6 +401,7 @@ export default defineComponent({
           });
         },
         onCancel() {
+          formState.selectedRowKeys = [];
         },
       })
     }

+ 3 - 2
vue/src/views/taskAndLog/dotask/index.vue

@@ -282,6 +282,7 @@ export default defineComponent({
     }
 
     const onDel = (item: any) => {
+      formState.selectedRowKeys = [];
       if (item) {
         formState.selectedRowKeys.push(item.doTaskID as never)
       }
@@ -291,7 +292,7 @@ export default defineComponent({
         return false;
       }
       Modal.confirm({
-        title: '确认删除选中的数据?',
+        title: '确认删除选中的任务信息?',
         icon: createVNode(ExclamationCircleOutlined),
         content: '',
         okText: '确认删除',
@@ -304,7 +305,7 @@ export default defineComponent({
           });
         },
         onCancel() {
-
+          formState.selectedRowKeys = [];
         },
       });
 

+ 3 - 2
vue/src/views/taskAndLog/dowork/index.vue

@@ -310,6 +310,7 @@ export default defineComponent({
     }
 
     const onDel = (item: any) => {
+      formState.selectedRowKeys = [];
       if (item) {
         formState.selectedRowKeys.push(item.doWorkID as never)
       }
@@ -320,7 +321,7 @@ export default defineComponent({
       }
 
       Modal.confirm({
-        title: '确认删除选中的人员信息?',
+        title: '确认删除选中的日志信息?',
         icon: createVNode(ExclamationCircleOutlined),
         content: '',
         okText: '确认删除',
@@ -333,7 +334,7 @@ export default defineComponent({
           });
         },
         onCancel() {
-
+          formState.selectedRowKeys = [];
         },
       });