commit

src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUserQueryController.java

@@ -83,7 +83,7 @@ public class TheRapyRecuperationUserQueryController {
     @ViReturn
     @RequiresAuthentication
     public Object pageData(String regionalNature, Integer state, PageForm pageForm,
-                           Integer startYear, Integer endYear, String unionId,
+                           Integer startYear, Integer endYear, String unionId,Integer isTakePartIn,
                            String unitId, String takePartInLineId, String agencyId, String lotId,
                            String takePartInBaseManagementId,String signUpMode) {
         Cnd cnd = Cnd.NEW();
@@ -108,6 +108,7 @@ public class TheRapyRecuperationUserQueryController {
             cnd.andEX("lxs.`year`", ">=", startYear);
             cnd.andEX("lxs.`year`", "<=", endYear);
             cnd.andEX("enroll.takePartInTravelAgencyId", "=", agencyId);
+            cnd.andEX("enroll.isTakePartIn", "=", isTakePartIn);
         } else {
             sql = Sqls.create("""
                           SELECT
@@ -136,6 +137,7 @@ public class TheRapyRecuperationUserQueryController {
             cnd.andEX("line.id", "=", takePartInLineId);
             cnd.andEX("line.regionalNature", "=", regionalNature);
             cnd.andEX("lineu.signUpMode","=",signUpMode);
+            cnd.andEX("enroll.isTakePartIn","=",isTakePartIn);
             if (state == 3) {
                 sql.setVar("lotSql", "(select lotName from the_rapy_recuperation_lot where id = ma.lotId) as lotName");
                 cnd.and("enroll.takePartInBaseManagementId", "is not", null);
@@ -164,7 +166,7 @@ public class TheRapyRecuperationUserQueryController {
 
     @At
     @ViReturn
-    public Object getXlLxsUserCount(String unionId, Integer startYear, Integer endYear, Integer signUpMode) {
+    public Object getXlLxsUserCount(Integer isTakePartIn, String unionId, Integer startYear, Integer endYear, Integer signUpMode) {
         Cnd cnd = Cnd.NEW();
         cnd.andEX("YEAR(signingUptime)", ">=", startYear);
         cnd.andEX("YEAR(signingUptime)", "<=", endYear);
@@ -174,6 +176,7 @@ public class TheRapyRecuperationUserQueryController {
         cnd.and("isNormal", "=", true);
         cnd.and("takePartInLineId", "is not", null);
         cnd.and("stateId", "=", TheRapyRecuperationState.PASS);
+        cnd.andEX("isTakePartIn", "=", isTakePartIn);
         cnd.andEX("(select signUpMode from the_rapy_recuperation_line_union_select where id = takePartInLineId)", "=", signUpMode);
         int count = baseService.dao().count(TheRapyRecuperationEnroll.class, cnd);
         int count1 = baseService.dao().count(TheRapyRecuperationEnroll.class, Cnd.where("takePartInTravelAgencyId", "is not", null)
@@ -181,12 +184,14 @@ public class TheRapyRecuperationUserQueryController {
                 .andEX("YEAR(signingUptime)", ">=", startYear)
                 .andEX("YEAR(signingUptime)", "<=", endYear)
                 .andEX("isNormal", "=", true)
+                .andEX("isTakePartIn", "=", isTakePartIn)
                 .andEX("(select signUpMode from the_rapy_recuperation_line_union_select where id = takePartInLineId)", "=", signUpMode));
         int count2 = baseService.dao().count(TheRapyRecuperationEnroll.class, Cnd.where("takePartInBaseManagementId", "is not", null)
                 .andEX("selfUnionId", "=", unionId)
                 .andEX("YEAR(signingUptime)", ">=", startYear)
                 .andEX("YEAR(signingUptime)", "<=", endYear)
                 .andEX("isNormal", "=", true)
+                .andEX("isTakePartIn", "=", isTakePartIn)
                 .andEX("(select signUpMode from the_rapy_recuperation_line_union_select where id = takePartInLineId)", "=", signUpMode));
         return Map.of("xlCount", count, "lxsCount", count1, "jdCount", count2);
     }
@@ -334,6 +339,7 @@ public class TheRapyRecuperationUserQueryController {
                          @Param(value = "lotId", required = false) String lotId,
                          @Param(value = "takePartInBaseManagementId", required = false) String takePartInBaseManagementId,
                          @Param(value = "signUpMode", required = false) String signUpMode,
+                         @Param(value = "isTakePartIn", required = false) Integer isTakePartIn,
                          @Param(value = "types", required = false) String[] types,
                          @Param(value = "satisfyPeople", required = false) Boolean satisfyPeople,
                          HttpServletResponse response) throws IOException {
@@ -378,6 +384,7 @@ public class TheRapyRecuperationUserQueryController {
         lineCnd.andEX("line.regionalNature", "=", regionalNature);
         lineCnd.andEX("lineu.signUpMode", "=", signUpMode);
         lineCnd.andEX("enroll.selfUnionId", "=", unionId);
+        lineCnd.andEX("enroll.isTakePartIn", "=", isTakePartIn);
         lineCnd.and("enroll.takePartInLineId", "is not", null);
         lineCnd.and("enroll.takePartInLineId", "!=", "");
         if (StrUtil.isNotBlank(lotId)) {
@@ -458,6 +465,7 @@ public class TheRapyRecuperationUserQueryController {
         baseCnd.andEX("base.`year`", ">=", startYear);
         baseCnd.andEX("base.`year`", "<=", endYear);
         baseCnd.andEX("base.takePartInBaseManagementId", "=", agencyId);
+        baseCnd.andEX("enroll.isTakePartIn", "=", isTakePartIn);
         baseCnd.and("enroll.takePartInBaseManagementId", "is not", null);
         baseCnd.and("enroll.takePartInBaseManagementId", "!=", "");
         baseCnd.desc("enroll.unionName");

src/main/resources/views/platform/theRapyRecuperation/baseManage/baseManagement.html

@@ -667,6 +667,7 @@ layout("/layouts/platform.html"){
                     contentType: false,
                     success: (data) => {
                         if (data.code === 0){
+                            this.$message.success(data.msg)
                             this.pageData();
                             this.importVisible = false
                         }else {

src/main/resources/views/platform/theRapyRecuperation/basicManage/line.html

@@ -852,7 +852,7 @@ layout("/layouts/platform.html"){
             },
             async doImport() {
                 if (this.importData.fileList.length === 0) {
-                    this.$message.warning("请选择文件！")
+                    this.notifyWarning("请选择文件！")
                     return
                 }
                 const data = new FormData();
@@ -860,12 +860,20 @@ layout("/layouts/platform.html"){
                     data.append("file", val.raw, val.raw.name);
                 });
                 this.importLoading = true
-                const resp = await $.post(loc() + "/travelLineImport",data)
+                const resp = await $.ajax({
+                    url: loc() + '/travelLineImport',
+                    type: 'POST',
+                    data: data,
+                    processData: false,
+                    contentType: false
+                })
                 if (resp.code === 0){
+                    this.$message.success(resp.msg)
                     this.pageData();
                     this.importVisible = false
+                    this.importLoading = false
                 }else {
-                    this.$message.warning("导入失败")
+                    this.notifyWarning("导入失败")
                     this.importLoading = false
                 }
             },

src/main/resources/views/platform/theRapyRecuperation/basicManage/travelAgency.html

@@ -403,7 +403,7 @@ layout("/layouts/platform.html"){
             },
             async doImport() {
                 if (this.importData.fileList.length === 0) {
-                    this.$message.warning("请选择文件！")
+                    this.notifyWarning("请选择文件！")
                     return
                 }
                 const data = new FormData();
@@ -413,13 +413,20 @@ layout("/layouts/platform.html"){
                 });
                 this.importLoading = true
 
-                const resp = await $.post(loc() + '/travelAgencyImport',data)
+                const resp = await $.ajax({
+                    url: loc() + '/travelAgencyImport',
+                    type: 'POST',
+                    data: data,
+                    processData: false,
+                    contentType: false
+                })
                 if (resp.code===0){
+                    this.$message.success(resp.msg)
                     this.pageData();
                     this.importVisible = false
                     this.importLoading = false
                 }else {
-                    this.$message.warning("导入失败")
+                    this.notifyWarning("导入失败")
                     this.importLoading = false
                 }
             },

src/main/resources/views/platform/theRapyRecuperation/process/TheRapyUserQuery.html

@@ -95,6 +95,15 @@ layout("/layouts/platform.html"){
                                     </el-option>
                                 </el-select>
                             </el-col>
+                            <el-col :span="12">
+                                <span>是否参加：</span>
+                                <el-radio-group @change="doSearch();getXlLxsUserCount()" size="medium"
+                                                v-model="pageForm.isTakePartIn">
+                                    <el-radio-button label="">全部</el-radio-button>
+                                    <el-radio-button label="1">已参加</el-radio-button>
+                                    <el-radio-button label="0">未参加</el-radio-button>
+                                </el-radio-group>
+                            </el-col>
                             <!--  <el-col :span="12">
                                   <span>所属单位：</span>
                                   <el-select v-model="pageForm.unitId" placeholder="请选择所属单位" @change="doSearch"
@@ -619,6 +628,7 @@ layout("/layouts/platform.html"){
                     regionalNature: '',
                     signUpMode: '',
                     lotId:'',
+                    isTakePartIn:'',
                     takePartInLineId:'',
                 },
                 multipleSelection: [],
@@ -688,6 +698,7 @@ layout("/layouts/platform.html"){
                     state,
                     lotId,
                     linePlayTime,
+                    isTakePartIn,
                 } = this.pageForm
                 let types = this.pageForm.state == 1 ? JSON.stringify(['line']) : JSON.stringify(['base'])
                 window.open(loc() + "/doExport?takePartInBaseManagementId=" + takePartInBaseManagementId +
@@ -702,6 +713,7 @@ layout("/layouts/platform.html"){
                     "&takePartInLineId=" + takePartInLineId +
                     "&state=" + state +
                     "&lotId=" + lotId +
+                    "&isTakePartIn=" + isTakePartIn +
                     "&satisfyPeople=false" +
                     "&types=" + types +
                     "&linePlayTime=" + linePlayTime)
@@ -970,6 +982,7 @@ layout("/layouts/platform.html"){
                     unionId: this.pageForm.unionId,
                     startYear: this.pageForm.startYear,
                     endYear: this.pageForm.endYear,
+                    isTakePartIn: this.pageForm.isTakePartIn,
                     signUpMode: this.pageForm.signUpMode
                 })
                 this.options.forEach((v, index) => {