修改bug

jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/controller/KcSysConfigController.java

@@ -9,11 +9,15 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog;
 import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig;
 import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService;
 
@@ -22,12 +26,19 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
+import org.jeecg.modules.kc.kcXqxnHistory.service.IKcXqxnHistoryService;
+import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao;
+import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao;
+import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoService;
+import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -52,7 +63,14 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class KcSysConfigController extends JeecgController<KcSysConfig, IKcSysConfigService> {
 	@Autowired
 	private IKcSysConfigService kcSysConfigService;
-	
+
+	 @Autowired
+	 private IKcKechengbiaoService kcKechengbiaoService;
+
+	 @Autowired
+	 private IKcKetangbiaoService kcKetangbiaoService;
+	 @Autowired
+	 private IKcXqxnHistoryService kcXqxnHistoryService;
 	/**
 	 * 分页列表查询
 	 *
@@ -100,7 +118,23 @@ public class KcSysConfigController extends JeecgController<KcSysConfig, IKcSysCo
 	@ApiOperation(value="课程系统配置-编辑", notes="课程系统配置-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody KcSysConfig kcSysConfig) {
+		if(StringUtils.isNotBlank(kcSysConfig.getFlag1())){
+			QueryWrapper<KcXqxnHistory> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("title",kcSysConfig.getFlag1());
+			queryWrapper.last("limit 1");
+			KcXqxnHistory kcXqxnHistory = kcXqxnHistoryService.getOne(queryWrapper);
+			if(kcXqxnHistory==null){
+				KcXqxnHistory kcXqxnHistoryPar = new KcXqxnHistory();
+				kcXqxnHistoryPar.setTitle(kcSysConfig.getFlag1());
+				kcXqxnHistoryPar.setStartTime(DateUtil.parse(kcSysConfig.getBxqkssj(),"yyyy-MM-dd"));
+				kcXqxnHistoryPar.setEndTime(DateUtil.parse(kcSysConfig.getBxqjssj(),"yyyy-MM-dd"));
+				kcXqxnHistoryService.save(kcXqxnHistoryPar);
+			}else{
+				kcXqxnHistoryService.updateById(kcXqxnHistory);
+			}
+		}
 		kcSysConfigService.updateById(kcSysConfig);
+
 		return Result.OK("编辑成功!");
 	}
 	
@@ -228,4 +262,53 @@ public class KcSysConfigController extends JeecgController<KcSysConfig, IKcSysCo
 		 return Result.OK(list);
 	 }
 
+
+	 @AutoLog(value = "课程系统配置-通过id查询")
+	 @GetMapping(value = "/listKcxx")
+	 public Result<IPage<KcSysConfig>> listKcxx(KcSysConfig kcSysConfig,HttpServletRequest req) {
+		 try {
+			 KcKechengbiao kcKechengbiao = new KcKechengbiao();
+			 kcKechengbiaoService.syncKechengbiao(kcKechengbiao);
+
+			 kcSysConfig = kcSysConfigService.getById("1");
+			 String bxqkssj = kcSysConfig.getBxqkssj();
+			 //插入数据
+			 KcKetangbiao kcKetangbiao = new KcKetangbiao();
+			 List<KcKetangbiao> list = kcKetangbiaoService.selectSyncList(kcKetangbiao);
+			 List<KcKetangbiao> arrayList = new ArrayList<>();
+			 for(int i=0;i<list.size();i++){
+				 KcKetangbiao kcKetangbiaoOld = list.get(i);
+				 try {
+					 String jkzc[] = kcKetangbiaoOld.getJkzc().split(",");
+					 String week = kcKetangbiaoOld.getWeek();
+					 for(int j=0;j<jkzc.length;j++){
+						 KcKetangbiao kcKetangbiaoAddNew = new KcKetangbiao();
+						 int djz = Integer.parseInt(jkzc[j]);
+						 BeanUtils.copyProperties(kcKetangbiaoOld,kcKetangbiaoAddNew);
+						 kcKetangbiaoAddNew.setId(null);
+						 //skrq 生成规则，取本学开始时间（kc_sys_config.bxqkssj）+(jkzc-1)*7+week
+						 int addSj = (djz -1 )*7+Integer.parseInt(week)-1;
+						 Date date = DateUtils.parseDate(bxqkssj,"yyyy-MM-dd");
+						 Calendar c = Calendar.getInstance();
+						 c.setTime(date);
+						 c.add(Calendar.DAY_OF_MONTH, addSj);
+						 String skrq = DateUtils.formatDate(c,"yyyy-MM-dd");
+						 kcKetangbiaoAddNew.setSkrq(skrq);
+						 kcKetangbiaoAddNew.setDijizhou(djz);
+						 arrayList.add(kcKetangbiaoAddNew);
+					 }
+				 }catch (Exception e){
+					 e.printStackTrace();
+				 }
+			 }
+			 kcKetangbiaoService.saveBatch(arrayList);
+
+
+			 return Result.OK("操作成功");
+		 }catch (Exception e){
+			 e.printStackTrace();
+			 return Result.error("操作失败，请联系管理员"+e.getMessage());
+		 }
+	 }
+
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml

@@ -411,13 +411,16 @@
         kt.hh as jieci,
         kt.skdd as skdd,
         kt.week as week,
+        kt.kcxz as kcxz,
         kt.hh as hh,
         xu.DWMC as tkdwmc,
-        fen.avgscore as tkpjjg
+        fen.avgscore as tkpjjg,
+        if(kc.szkc='1','是','否') as szkc
         from kc_evaluation a
         left join kc_ketangbiao kt on kt.id = a.minkcid
         left join xxhbuser xu on xu.GH = a.upuserid
         left join zongtipingjiapingjunfen fen on fen.kechengbiaoid = kt.kechengbiaoid
+        left join kc_kechengbiao kc on kc.id = kt.kechengbiaoid
         ${ew.customSqlSegment}
     </select>
 

jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/KcEvaluationVo.java

@@ -177,5 +177,9 @@ public class KcEvaluationVo implements Serializable {
 
     @TableField(exist = false)
     private String upUserName;
+    @TableField(exist = false)
+    private String kcxz;
+    @TableField(exist = false)
+    private String szkc;
 
 }