diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhKhZpController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhKhZpController.java index 4417eac..92c9979 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhKhZpController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhKhZpController.java @@ -7,9 +7,7 @@ import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; import com.budwk.app.sys.models.Sys_user; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.dayofficework.ghkh.model.Kh_record; -import com.budwk.app.zhgh.dayofficework.ghkh.model.Kh_zb; -import com.budwk.app.zhgh.dayofficework.ghkh.model.Kh_zp; +import com.budwk.app.zhgh.dayofficework.ghkh.model.*; import com.budwk.app.zhgh.dayofficework.ghkh.service.KhZbService; import com.budwk.app.zhgh.dayofficework.ghkh.service.KhzpService; import com.google.common.util.concurrent.AtomicDouble; @@ -119,14 +117,20 @@ public class GhKhZpController { public Result openView(String id) { Kh_zb khzb = khZbService.khzb(id); List list = khzpService.query(Cnd.where("zb_id", "=", id).and("flatid", "=", SecurityUtil.getUnionId())); - khzb.getNrs().forEach(nr -> { - nr.getBzs().forEach(bz -> { - Kh_zp zp = list.stream().filter(v -> v.getBz_id().equals(bz.getId())).findFirst().orElse(null); - if (zp != null) { - bz.setZp(zp); - } - }); - }); + for (kh_nr nr : khzb.getNrs()) { + for (Kh_bz bz : nr.getBzs()) { + Kh_zp zp = list.stream().filter(v -> v.getBz_id().equals(bz.getId())).findFirst().orElse(null); + if (zp != null) { + bz.setZp(zp); + } + Kh_xghsh xghsh = khZbService.dao().fetch(Kh_xghsh.class, Cnd.where("zb_id", "=", id).and("bz_id", "=", bz.getId()) + .and("flatid", "=", SecurityUtil.getUnionId())); + if(xghsh != null) { + bz.setSchools(xghsh.getSchools()); + bz.setAddition(xghsh.getAddition()); + } + } + } NutMap nutMap = Lang.obj2nutmap(khzb); Kh_record record = khZbService.dao().fetch(Kh_record.class, Cnd.where("zb_id", "=", id).and("union_id", "=", SecurityUtil.getUnionId())); if(record != null) { diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhkhKhphController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhkhKhphController.java index beb6a09..a7630e9 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhkhKhphController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhkhKhphController.java @@ -32,6 +32,8 @@ import org.nutz.mvc.annotation.Param; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.ArrayList; import java.util.List; @@ -100,7 +102,8 @@ public class GhkhKhphController { } else { record.setOffLineFinalScore(score); } - record.setTotalScore(record.getOnLineFinalScore() + record.getOffLineFinalScore()); + BigDecimal bd = BigDecimal.valueOf(record.getOffLineFinalScore()).setScale(2, RoundingMode.HALF_UP); + record.setTotalScore(record.getOnLineFinalScore() + bd.doubleValue()); khZbService.dao().update(record); List list = khZbService.dao().query(Kh_record.class, Cnd.where("zb_id", "=", khId).desc("totalScore")); @@ -142,7 +145,7 @@ public class GhkhKhphController { List exportEntities = new ArrayList<>(); exportEntities.add(new ExcelExportEntity("序号", "index", 10)); exportEntities.add(new ExcelExportEntity("年度", "annual", 10)); - exportEntities.add(new ExcelExportEntity("分工会名称", "unionname", 30)); + exportEntities.add(new ExcelExportEntity("分工会名称", "unionName", 30)); exportEntities.add(new ExcelExportEntity("线上得分", "xgh_score", 20)); exportEntities.add(new ExcelExportEntity("线上最终得分" + (config.getOnLine() != null ? "（" + config.getOnLine() + "%）" : ""), "onLineFinalScore", 20)); exportEntities.add(new ExcelExportEntity("线下得分", "offLineScore", 20)); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhkhXghshController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhkhXghshController.java index d60c1cd..e9ee9d5 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhkhXghshController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/ghkh/controller/GhkhXghshController.java @@ -23,6 +23,8 @@ import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.POST; import org.nutz.mvc.annotation.Param; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.List; /** @@ -176,12 +178,14 @@ public class GhkhXghshController { record.setXgh_score(score); ExamConfig config = baseService.dao().fetch(ExamConfig.class, Cnd.NEW()); + if(config.getOnLine() != null) { record.setOnLineFinalScore(score * config.getOnLine() * 0.01); } else { - record.setOnLineFinalScore((double) score); + record.setOnLineFinalScore(score); } - record.setTotalScore(record.getOnLineFinalScore()); + BigDecimal bd = BigDecimal.valueOf(record.getOnLineFinalScore()).setScale(2, RoundingMode.HALF_UP); + record.setTotalScore(bd.doubleValue()); record.setState(3); baseService.dao().update(record); diff --git a/src/main/resources/views/platform/zhgh/dayofficework/ghkh/khph.html b/src/main/resources/views/platform/zhgh/dayofficework/ghkh/khph.html index 25426b3..e98c34f 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/ghkh/khph.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/ghkh/khph.html @@ -40,7 +40,7 @@ layout("/layouts/platform.html"){ -