2023年7月28日 修改新导出身份配置表,修改报错，，

jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java

@@ -59,8 +59,8 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper = QueryGenerator.initQueryWrapper("a", kcExportConfigTpkwcqkjzglx, req.getParameterMap());
+		QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper = QueryGenerator.initQueryWrapper(kcExportConfigTpkwcqkjzglx, req.getParameterMap());
-		queryWrapper.eq(StringUtils.isNotBlank(kcExportConfigTpkwcqkjzglx.getDwmc()),"b.dwmc",kcExportConfigTpkwcqkjzglx.getDwmc());
+//		queryWrapper.eq(StringUtils.isNotBlank(kcExportConfigTpkwcqkjzglx.getDwmc()),"b.dwmc",kcExportConfigTpkwcqkjzglx.getDwmc());
 		Page<KcExportConfigTpkwcqkjzglx> page = new Page<KcExportConfigTpkwcqkjzglx>(pageNo, pageSize);
 		IPage<KcExportConfigTpkwcqkjzglx> pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper);
 		return Result.OK(pageList);

jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/entity/KcExportConfigTpkwcqkjzglx.java

@@ -64,12 +64,25 @@ public class KcExportConfigTpkwcqkjzglx implements Serializable {
     @ApiModelProperty(value = "听课类型（字典：tpkwcqkjzglx	）")
     private java.lang.String tklx;
 
-    //教职工姓名
+    /**学院*/
-    @TableField(exist = false)
+    @Excel(name = "学院", width = 15)
-    private java.lang.String xm;
+    @ApiModelProperty(value = "学院")
-
-    //单位名称
-    @TableField(exist = false)
     private java.lang.String dwmc;
+    /**姓名*/
+    @Excel(name = "姓名", width = 15)
+    @ApiModelProperty(value = "姓名")
+    private java.lang.String xm;
+    /**身份*/
+    @Excel(name = "身份", width = 15)
+    @ApiModelProperty(value = "身份")
+    private java.lang.String sf;
+    /**状态*/
+    @Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private java.lang.String zt;
+    /**每学期应听课次数*/
+    @Excel(name = "每学期应听课次数", width = 15)
+    @ApiModelProperty(value = "每学期应听课次数")
+    private java.lang.String ytkcs;
 
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java

@@ -157,11 +157,13 @@ public class Export extends BaseExport {
 		}
 		//********************************取数据END*********************************************************/
 		//********************************通用*************************************************************/
+		//xym 学院名称
 		result.put("xqxn",xqxnParam);
 		//填进去数量
 		result.put("oneListSize",   StringUtils.defaultString(String.valueOf(oneList.size()),"0"));
 		result.put("twoListSize",   StringUtils.defaultString(String.valueOf(twoList.size()),"0"));
 		result.put("threeListSize",   StringUtils.defaultString(String.valueOf(threeList.size()),"0"));
+		//fourListSize
 
 		//********************************表头END**********************************************************/
 		wo.replaceTextPlus(result);

jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml

@@ -2,26 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.kc.config.mapper.KcExportConfigTpkwcqkjzglxMapper">
 
-    <select id="selectList" resultType="org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx">
+<!--    <select id="selectList" resultType="org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx">-->
-        SELECT
+<!--        SELECT-->
-            a.*,
+<!--            a.*,-->
-            b.xm,
+<!--            b.xm,-->
-            b.dwmc
+<!--            b.dwmc-->
-        FROM
+<!--        FROM-->
-        kc_export_config_tpkwcqkjzglx a
+<!--        kc_export_config_tpkwcqkjzglx a-->
-        LEFT JOIN xxhbuser b ON b.gh = a.gh
+<!--        LEFT JOIN xxhbuser b ON b.gh = a.gh-->
-        ${ew.customSqlSegment}
+<!--        ${ew.customSqlSegment}-->
-    </select>
+<!--    </select>-->
 
-    <select id="selectPage" resultType="org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx">
+<!--    <select id="selectPage" resultType="org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx">-->
-        SELECT
+<!--        SELECT-->
-            a.*,
+<!--            a.*,-->
-            b.xm,
+<!--            b.xm,-->
-            b.dwmc
+<!--            b.dwmc-->
-        FROM
+<!--        FROM-->
-        kc_export_config_tpkwcqkjzglx a
+<!--        kc_export_config_tpkwcqkjzglx a-->
-        LEFT JOIN xxhbuser b ON b.gh = a.gh
+<!--        LEFT JOIN xxhbuser b ON b.gh = a.gh-->
-        ${ew.customSqlSegment}
+<!--        ${ew.customSqlSegment}-->
-    </select>
+<!--    </select>-->
 
 </mapper>

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/RefreshLiveServer.java

@@ -55,15 +55,19 @@ public class RefreshLiveServer extends BaseSync {
                 log.error(e.getMessage(),e);
             }
         });
-        UpdateWrapper<KcZhihuijiaoshi> onUw = new UpdateWrapper();
+        if(!onList.isEmpty()){
-        onUw.set("sfyx",0);
+            UpdateWrapper<KcZhihuijiaoshi> onUw = new UpdateWrapper();
-        onUw.in("id",onList);
+            onUw.set("sfyx",0);
-        kcZhihuijiaoshiService.update(onUw);
+            onUw.in("id",onList);
+            kcZhihuijiaoshiService.update(onUw);
+        }
 
-        UpdateWrapper<KcZhihuijiaoshi> outUw = new UpdateWrapper();
+        if(!outList.isEmpty()) {
-        outUw.set("sfyx",1);
+            UpdateWrapper<KcZhihuijiaoshi> outUw = new UpdateWrapper();
-        outUw.in("id",outList);
+            outUw.set("sfyx", 1);
-        kcZhihuijiaoshiService.update(outUw);
+            outUw.in("id", outList);
+            kcZhihuijiaoshiService.update(outUw);
+        }
     }
 
     /**