diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml index 90e9b97d..456cf0f1 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml @@ -98,7 +98,7 @@ - GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs + GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs,skdd,xkrs,jgh @@ -120,7 +120,7 @@ - GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs + GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs,skdd,xkrs,jgh diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java index 911cff58..0837eb4a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java @@ -746,8 +746,8 @@ public class ZyInfoController extends JeecgController { @ApiOperation(value="作业发布-通过id查询", notes="作业发布-通过id查询") @GetMapping(value = "/zyzb") - public Result zyzb(@RequestParam(name="rwbh") String rwbh,@RequestParam(name="xqxn") String xqxn,@RequestParam(name="teano") String teano,@RequestParam(name="zyLeixing") String zyLeixing) { - ZyInfo zyInfo = zyInfoService.zyzb(rwbh,xqxn,teano,zyLeixing); + public Result> zyzb(@RequestParam(name="rwbh") String rwbh,@RequestParam(name="xqxn") String xqxn,@RequestParam(name="teano") String teano,@RequestParam(name="zyLeixing") String zyLeixing) { + List zyInfo = zyInfoService.zyzb(rwbh,xqxn,teano,zyLeixing); return Result.OK(zyInfo); } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java index 16a43416..772c5da7 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java @@ -27,5 +27,5 @@ public interface ZyInfoMapper extends BaseMapper { ZyInfo getKechengById(@Param("id") String id); - ZyInfo zyzb(@Param("rwbh")String rwbh, @Param("xqxn")String xqxn, @Param("teano")String teano, @Param("zyLeixing")String zyLeixing); + List zyzb(@Param("rwbh")String rwbh, @Param("xqxn")String xqxn, @Param("teano")String teano, @Param("zyLeixing")String zyLeixing); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml index 35df65c3..0efb137e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml @@ -36,7 +36,7 @@ kc_kechengbiao ${ew.customSqlSegment} ) t on t.jgh = b.create_by and t.rwbh = b.rwbh and t.xqxn = b.xnxq - GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs + GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs,skdd,xkrs,jgh @@ -52,7 +52,7 @@ kc_kechengbiao ${ew.customSqlSegment} ) t on t.jgh = b.create_by and t.rwbh = b.rwbh and t.xqxn = b.xnxq - GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs + GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs,skdd,xkrs,jgh @@ -63,6 +63,29 @@ \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/IZyInfoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/IZyInfoService.java index d72fd889..577149ca 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/IZyInfoService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/IZyInfoService.java @@ -25,5 +25,5 @@ public interface IZyInfoService extends IService { ZyInfo getKechengById(String id); - ZyInfo zyzb(String rwbh, String xqxn, String teano, String zyLeixing); + List zyzb(String rwbh, String xqxn, String teano, String zyLeixing); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/impl/ZyInfoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/impl/ZyInfoServiceImpl.java index 7283fd89..70de599f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/impl/ZyInfoServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/impl/ZyInfoServiceImpl.java @@ -43,7 +43,7 @@ public class ZyInfoServiceImpl extends ServiceImpl impleme } @Override - public ZyInfo zyzb(String rwbh, String xqxn, String teano, String zyLeixing) { + public List zyzb(String rwbh, String xqxn, String teano, String zyLeixing) { return baseMapper.zyzb(rwbh,xqxn,teano,zyLeixing); } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml index 7afcce13..a6993de8 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml @@ -33,7 +33,7 @@