修改bug

jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/impl/KcJieciServiceImpl.java

@@ -73,8 +73,20 @@ public class KcJieciServiceImpl extends ServiceImpl<KcJieciMapper, KcJieci> impl
                     if(Integer.parseInt(dqsj)>=Integer.parseInt(kssj)&&Integer.parseInt(dqsj)<Integer.parseInt(jssj)){
                         dqkssj = DateUtils.getDate("yyyy-MM-dd");
                         dqjc = list.get(i).getJieci();
-                        xyjkssj = DateUtils.getDate("yyyy-MM-dd");
+                        if(i==list.size()-1){
-                        xyjjc = list.get(i+1).getJieci();
+                            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");//设置格式
+                            Calendar calendar = Calendar.getInstance(); //创建Calendar 的实例
+                            calendar.add(Calendar.DAY_OF_MONTH, +1); //当前时间减去一天，即一天前的时间
+                            //如果当前时间大于最后一节课则赋值给最后一节课
+                            dqkssj = DateUtils.getDate("yyyy-MM-dd");
+                            dqjc = "";
+                            //下一节课赋值给明天第一节
+                            xyjkssj = simpleDateFormat.format(calendar.getTime());
+                            xyjjc = list.get(0).getJieci();
+                        }else{
+                            xyjkssj = DateUtils.getDate("yyyy-MM-dd");
+                            xyjjc = list.get(i+1).getJieci();
+                        }
                         break;
                     }
                 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java

@@ -267,6 +267,19 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
 		 IPage<KcKetangbiao> pageList = kcKetangbiaoService.getKclblist(page, kcKetangbiao);
 		 return Result.OK(pageList);
 	 }
+
+
+
+	 @ApiOperation(value="学生首页课程信息", notes="学生首页课程信息")
+	 @GetMapping(value = "/getStudentKclblist")
+	 public Result<IPage<KcKetangbiao>> getStudentKclblist(KcKetangbiao kcKetangbiao,
+													@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													HttpServletRequest req) {
+		 Page<KcKetangbiao> page = new Page<KcKetangbiao>(pageNo, pageSize);
+		 IPage<KcKetangbiao> pageList = kcKetangbiaoService.getStudentKclblist(page, kcKetangbiao);
+		 return Result.OK(pageList);
+	 }
 	 // ------------------------------yangjun------------------------------
 
 

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java

@@ -256,4 +256,8 @@ public class KcKetangbiao implements Serializable {
     private String startTime;
     @TableField(exist = false)
     private String endTime;
+    @TableField(exist = false)
+    private String xh;
+    @TableField(exist = false)
+    private String xjkssj;
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java

@@ -25,4 +25,6 @@ public interface KcKetangbiaoMapper extends BaseMapper<KcKetangbiao> {
     List<Map<String,Object>> selectJrTkCount(String skrq);
 
     List<Map<String, Object>> getIndexYkktstj(KcKetangbiao kcKetangbiao);
+
+    IPage<KcKetangbiao> getStudentKclblist(Page<KcKetangbiao> page, KcKetangbiao kcKetangbiao);
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml

@@ -72,4 +72,37 @@
             </if>
         </where>
     </select>
+
+
+
+    <select id="getStudentKclblist" parameterType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao"  resultType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao">
+        SELECT id, kcbh,kcmc,f_skjs(skjs) as skjs,zc,xkrs,rwbh,kkdw,kcxz,skdd,sksj,jkzc,hh,week,
+            hhks,hhjs,dsz,wwks,wwjs,zbfs,hyh,hymm,kclj,beizhu,zbpx,kkdwid,skrq,kechengbiaoid,
+            tingkecishu,sftk,tkyy,sfcj,skxs,sfxsk
+        FROM kc_ketangbiao kt WHERE 1=1
+            <if test="kcKetangbiao.hh!=null and kcKetangbiao.hh!=''">
+                and kt.hh in
+                <foreach item="item" index="index" collection="kcKetangbiao.hh.split(',')"  open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="kcKetangbiao.xh!=null and kcKetangbiao.xh!=''">
+                AND rwbh IN ( SELECT KCAPZBBH FROM xxhbxsxkb WHERE xh = #{kcKetangbiao.xh} )
+            </if>
+            <if test="kcKetangbiao.skrq!=null and kcKetangbiao.skrq!=''">
+                AND skrq = #{kcKetangbiao.skrq}
+            </if>
+            <if test="kcKetangbiao.xjkssj!=null and kcKetangbiao.xjkssj!=''">
+                AND hhks > #{kcKetangbiao.xjkssj}
+            </if>
+            <if test="kcKetangbiao.startTime!=null and kcKetangbiao.startTime!=''">
+                AND skrq > #{kcKetangbiao.startTime}
+            </if>
+            <if test="kcKetangbiao.endTime!=null and kcKetangbiao.endTime!=''">
+                AND skrq &lt; #{kcKetangbiao.endTime}
+            </if>
+        ORDER BY
+        skrq asc,
+        hh asc
+    </select>
 </mapper>

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java

@@ -22,4 +22,6 @@ public interface IKcKetangbiaoService extends IService<KcKetangbiao> {
     List<Map<String,Object>> selectJrTkCount(String skrq);
 
     List<Map<String, Object>> getIndexYkktstj(KcKetangbiao kcKetangbiao);
+
+    IPage<KcKetangbiao> getStudentKclblist(Page<KcKetangbiao> page, KcKetangbiao kcKetangbiao);
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java

@@ -36,4 +36,9 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl<KcKetangbiaoMapper, KcK
     public List<Map<String, Object>> getIndexYkktstj(KcKetangbiao kcKetangbiao) {
         return baseMapper.getIndexYkktstj(kcKetangbiao);
     }
+
+    @Override
+    public IPage<KcKetangbiao> getStudentKclblist(Page<KcKetangbiao> page, KcKetangbiao kcKetangbiao) {
+        return baseMapper.getStudentKclblist(page,kcKetangbiao);
+    }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -568,7 +568,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			String passwordEncode = PasswordUtil.encrypt(user.getUsername(), "123456", salt);
 			user.setPassword(passwordEncode);
 			user.setPhone(username);
-			user.setUserIdentity(1);
+			if(StringUtils.indexOf(containerId,"ou=jzg") != -1){
+				user.setUserIdentity(2);
+			}else if(StringUtils.indexOf(containerId,"ou=bzks") != -1){
+				user.setUserIdentity(1);
+			}
 			user.setWorkNo(username);
 			user.setStatus(1);
 			user.setDelFlag(0);

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -138,12 +138,12 @@ spring:
           password: root
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
-        multi-oracle:
+#        multi-oracle:
           #url: jdbc:oracle:thin:@//JN7JP1QPL10ZKOW:1521/ORCL
-          url: jdbc:oracle:thin:@JN7JP1QPL10ZKOW:1521:ORCL
+#          url: jdbc:oracle:thin:@JN7JP1QPL10ZKOW:1521:ORCL
-          username: xskc
+#          username: xskc
-          password: xskc
+#          password: xskc
-          driver-class-name: oracle.jdbc.OracleDriver
+#          driver-class-name: oracle.jdbc.OracleDriver
   #redis 配置
   redis:
     database: 1