diff --git a/src/main/java/io/v/nutz/base/dao/CndPlus.java b/src/main/java/io/v/nutz/base/dao/CndPlus.java index da41267..1d5fa2e 100644 --- a/src/main/java/io/v/nutz/base/dao/CndPlus.java +++ b/src/main/java/io/v/nutz/base/dao/CndPlus.java @@ -1,7 +1,8 @@ package io.v.nutz.base.dao; -import cn.hutool.core.bean.BeanUtil; + import cn.hutool.core.util.StrUtil; + import io.v.nutz.base.query.PageForm; import org.nutz.dao.Cnd; import org.nutz.lang.Lang; @@ -39,4 +40,5 @@ public class CndPlus extends Cnd { } return this; } + } diff --git a/src/main/java/io/v/nutz/base/utils/ExcelUtils.java b/src/main/java/io/v/nutz/base/utils/ExcelUtils.java new file mode 100644 index 0000000..55c7ce9 --- /dev/null +++ b/src/main/java/io/v/nutz/base/utils/ExcelUtils.java @@ -0,0 +1,55 @@ +package io.v.nutz.base.utils; + +import freemarker.template.Configuration; +import freemarker.template.Template; + +import java.io.*; +import java.util.HashMap; +import java.util.Map; + +/** + * 导出excel Utils + * + * @author Administrator + */ +public class ExcelUtils { + private static Configuration configuration = null; + private static Map allTemplates = null; + private static String realPath = "src/main/resources/ftl"; + + public ExcelUtils() { + throw new AssertionError(); + } + + /** + * 创建excel + * + * @param dataMap + * @param type + * @return + */ + public static File createExcel(Map dataMap, String type, String valueName) { + try { + configuration = new Configuration(); + configuration.setDefaultEncoding("UTF-8"); + configuration.setDirectoryForTemplateLoading(new File(realPath)); + allTemplates = new HashMap(); + allTemplates.put(type, configuration.getTemplate(valueName)); + } catch (IOException ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + String name = "temp" + (int) (Math.random() * 100000) + ".xls"; + File file = new File(name); + Template template = allTemplates.get(type); + try { + Writer w = new OutputStreamWriter(new FileOutputStream(file), "utf-8"); + template.process(dataMap, w); + w.close(); + } catch (Exception e) { + e.printStackTrace(); + throw new RuntimeException(e); + } + return file; + } +} \ No newline at end of file diff --git a/src/main/java/io/v/nutz/base/utils/MsgApi.java b/src/main/java/io/v/nutz/base/utils/MsgApi.java index 55a0cc6..3099335 100644 --- a/src/main/java/io/v/nutz/base/utils/MsgApi.java +++ b/src/main/java/io/v/nutz/base/utils/MsgApi.java @@ -103,6 +103,39 @@ public class MsgApi { // } } + public void sendMsg(String openId, String template_id, String url, NutMap dataMap) { + + try { + if ("否".equals(Globals.MyConfig.getString("SengMsg"))) { + log.info("发送失败，消息暂未开启！！！！！！！！！！！！！！！！！！！！！！！！！！！！！"); + return; + } + if (StrUtil.isBlank(openId) || StrUtil.isBlank(template_id) || Lang.isEmpty(dataMap)) { + log.info("发送失败，缺少需要参数请检查！！！！！！！！！！！！！！！！！！！！！！！！！！！！！"); + return; + } + + /* String token = getToken(); + + NutMap map = new NutMap(); + map.setv("touser", openId); + map.setv("template_id", template_id); + map.setv("url", Globals.AppDomain + url); + map.setv("topcolor", "#FF0000"); + map.setv("data", dataMap); + String s = HttpUtil.post("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + token, Json.toJson(map)); + JSONObject parseObject = JSON.parseObject(s); + log.info(Json.toJson(map)); + if (parseObject.getString("errmsg").equals("ok")) { + log.info("发送成功>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"); + } else { + log.error(parseObject.getString("errmsg")); + log.info("发送失败>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"); + }*/ + } catch (Exception e) { + e.printStackTrace(); + } + } /** * 获取token @@ -125,5 +158,14 @@ public class MsgApi { return token; } + /** + * 待审核模板 + * 1申请类型 + * 2申请人 + * 3部门 + * 4申请内容 + * 5申请时间 + */ + public String DSH_TEMPLATE_ID = "qakElY3lkcKYjFzsttAN1s3jn_cRGgUrbwUqGrbJI8Q"; } diff --git a/src/main/java/io/v/nutz/task/conn/NutConnectionProvider.java b/src/main/java/io/v/nutz/task/conn/NutConnectionProvider.java index 0c7f8a0..506e8e8 100644 --- a/src/main/java/io/v/nutz/task/conn/NutConnectionProvider.java +++ b/src/main/java/io/v/nutz/task/conn/NutConnectionProvider.java @@ -12,17 +12,18 @@ public class NutConnectionProvider implements ConnectionProvider { protected DataSource dataSource; protected String iocname = "dataSource"; - + @Override public Connection getConnection() throws SQLException { return dataSource.getConnection(); } - + @Override public void shutdown() throws SQLException {} - + @Override @SuppressWarnings("deprecation") public void initialize() throws SQLException { - if (dataSource != null) + if (dataSource != null) { return; + } Ioc ioc = AppContext.getDefault().getIoc(); dataSource = ioc.get(DataSource.class, iocname); } diff --git a/src/main/java/io/v/nutz/zhgh/jdh/constants/MechanismRolesEnum.java b/src/main/java/io/v/nutz/zhgh/jdh/constants/MechanismRolesEnum.java index be879f8..a4ae806 100644 --- a/src/main/java/io/v/nutz/zhgh/jdh/constants/MechanismRolesEnum.java +++ b/src/main/java/io/v/nutz/zhgh/jdh/constants/MechanismRolesEnum.java @@ -1,7 +1,8 @@ package io.v.nutz.zhgh.jdh.constants; -import io.v.nutz.annontation.SelectEnum; + +import io.v.nutz.base.annontation.SelectEnum; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/io/v/nutz/zhgh/jdh/controller/JdhCommonConrtroller.java b/src/main/java/io/v/nutz/zhgh/jdh/controller/JdhCommonConrtroller.java index e7f0d88..1d3da9f 100644 --- a/src/main/java/io/v/nutz/zhgh/jdh/controller/JdhCommonConrtroller.java +++ b/src/main/java/io/v/nutz/zhgh/jdh/controller/JdhCommonConrtroller.java @@ -2,7 +2,8 @@ package io.v.nutz.zhgh.jdh.controller; import cn.wizzer.framework.base.Result; import cn.wizzer.framework.base.service.BaseService; -import io.v.nutz.annontation.ViReturn; + +import io.v.nutz.base.annontation.ViReturn; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.entity.Record; diff --git a/src/main/java/io/v/nutz/zhgh/jdh/controller/JdhSjkbController.java b/src/main/java/io/v/nutz/zhgh/jdh/controller/JdhSjkbController.java index 335ba27..0eb137c 100644 --- a/src/main/java/io/v/nutz/zhgh/jdh/controller/JdhSjkbController.java +++ b/src/main/java/io/v/nutz/zhgh/jdh/controller/JdhSjkbController.java @@ -2,7 +2,8 @@ package io.v.nutz.zhgh.jdh.controller; import cn.wizzer.framework.base.Result; import cn.wizzer.framework.base.service.BaseService; -import io.v.nutz.service.ViService; + +import io.v.nutz.base.service.ViService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; diff --git a/src/main/java/io/v/nutz/zhgh/jdh/controller/cb/JdhMefpController.java b/src/main/java/io/v/nutz/zhgh/jdh/controller/cb/JdhMefpController.java index c8ae962..40d94f7 100644 --- a/src/main/java/io/v/nutz/zhgh/jdh/controller/cb/JdhMefpController.java +++ b/src/main/java/io/v/nutz/zhgh/jdh/controller/cb/JdhMefpController.java @@ -73,7 +73,7 @@ public class JdhMefpController { CndPlus cndPlus = CndPlus.create(); cndPlus.andEX("dbt.jdhid", "=", jdhid); -// cndPlus.andExcludeEmpty("uni.id", "=", union_id); +// cndPlus.andEx("uni.id", "=", union_id); // cndPlus.asc("unioncode"); sql.setCondition(cndPlus); diff --git a/src/main/java/io/v/nutz/zhgh/jdh/controller/zzjg/MechanismController.java b/src/main/java/io/v/nutz/zhgh/jdh/controller/zzjg/MechanismController.java index 58f3f96..28ac36b 100644 --- a/src/main/java/io/v/nutz/zhgh/jdh/controller/zzjg/MechanismController.java +++ b/src/main/java/io/v/nutz/zhgh/jdh/controller/zzjg/MechanismController.java @@ -91,8 +91,8 @@ public class MechanismController { cnd.and(pageForm.getSearchName(), "LIKE", "%" + pageForm.getSearchKeyword() + "%"); } cnd.desc("jgsz.mechanismcode"); - cnd.andExcludeEmpty("parentId", "=", StrUtil.isBlank(parentId) ? "5972c34ff68e4b0cbc6d0834fe88982b" : parentId); - /* cnd.andExcludeEmpty("jgsz.jdhid", "=", jdhid);*/ + cnd.andEx("parentId", "=", StrUtil.isBlank(parentId) ? "5972c34ff68e4b0cbc6d0834fe88982b" : parentId); + /* cnd.andEx("jgsz.jdhid", "=", jdhid);*/ sql.setCondition(cnd); return jgszViService.list(pageForm, sql); } diff --git a/src/main/java/io/v/nutz/zhgh/jdh/model/cb/Jdh_cbwj.java b/src/main/java/io/v/nutz/zhgh/jdh/model/cb/Jdh_cbwj.java index 40758a8..5401940 100644 --- a/src/main/java/io/v/nutz/zhgh/jdh/model/cb/Jdh_cbwj.java +++ b/src/main/java/io/v/nutz/zhgh/jdh/model/cb/Jdh_cbwj.java @@ -1,6 +1,7 @@ package io.v.nutz.zhgh.jdh.model.cb; -import io.v.nutz.modules.models.DbFile; + +import io.v.nutz.sys.models.Sys_file; import lombok.Data; import org.nutz.dao.entity.annotation.*; @@ -52,6 +53,6 @@ public class Jdh_cbwj implements Serializable { @Column @Comment("附件") @ColDefine(type = ColType.MYSQL_JSON) - private List files; + private List files; } diff --git a/src/main/java/io/v/nutz/zhgh/jdh/model/cb/Jdh_jdhxx.java b/src/main/java/io/v/nutz/zhgh/jdh/model/cb/Jdh_jdhxx.java index f60e90f..17d670f 100644 --- a/src/main/java/io/v/nutz/zhgh/jdh/model/cb/Jdh_jdhxx.java +++ b/src/main/java/io/v/nutz/zhgh/jdh/model/cb/Jdh_jdhxx.java @@ -1,5 +1,6 @@ package io.v.nutz.zhgh.jdh.model.cb; +import lombok.Data; import org.nutz.dao.entity.annotation.*; /** @@ -8,7 +9,7 @@ import org.nutz.dao.entity.annotation.*; * @author 赵欣雨 * @date 2020/8/17 15:40 */ - +@Data @Table("jdh_jdhxx") public class Jdh_jdhxx { @@ -53,68 +54,4 @@ public class Jdh_jdhxx { @ColDefine(type = ColType.INT, width = 1) private boolean jdhkqzt; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getJdhnf() { - return jdhnf; - } - - public void setJdhnf(String jdhnf) { - this.jdhnf = jdhnf; - } - - public String getJdhjs() { - return jdhjs; - } - - public void setJdhjs(String jdhjs) { - this.jdhjs = jdhjs; - } - - public String getJdhcs() { - return jdhcs; - } - - public void setJdhcs(String jdhcs) { - this.jdhcs = jdhcs; - } - - public String getJdhkqsj() { - return jdhkqsj; - } - - public void setJdhkqsj(String jdhkqsj) { - this.jdhkqsj = jdhkqsj; - } - - public String getJdhms() { - return jdhms; - } - - public void setJdhms(String jdhms) { - this.jdhms = jdhms; - } - - public boolean isJdhkqzt() { - return jdhkqzt; - } - - public void setJdhkqzt(boolean jdhkqzt) { - this.jdhkqzt = jdhkqzt; - } - - public String getJdhallname() { - return jdhallname; - } - - public void setJdhallname(String jdhallname) { - this.jdhallname = jdhallname; - } } diff --git a/src/main/java/io/v/nutz/zhgh/jdh/model/cb/Jdh_mefp.java b/src/main/java/io/v/nutz/zhgh/jdh/model/cb/Jdh_mefp.java index 3c1b54f..a1e6454 100644 --- a/src/main/java/io/v/nutz/zhgh/jdh/model/cb/Jdh_mefp.java +++ b/src/main/java/io/v/nutz/zhgh/jdh/model/cb/Jdh_mefp.java @@ -1,10 +1,11 @@ package io.v.nutz.zhgh.jdh.model.cb; +import lombok.Data; import org.nutz.dao.entity.annotation.*; import java.io.Serializable; - +@Data @Table("jdh_mefp") public class Jdh_mefp implements Serializable { @@ -40,51 +41,5 @@ public class Jdh_mefp implements Serializable { @ColDefine(type = ColType.INT, width = 4) private int bzzbs; - public String getJdhid() { - return jdhid; - } - public void setJdhid(String jdhid) { - this.jdhid = jdhid; - } - - public String getFghid() { - return fghid; - } - - public void setFghid(String fghid) { - this.fghid = fghid; - } - - public int getFps() { - return fps; - } - - public void setFps(int fps) { - this.fps = fps; - } - - public int getBzzbs() { - return bzzbs; - } - - public void setBzzbs(int bzzbs) { - this.bzzbs = bzzbs; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDbtid() { - return dbtid; - } - - public void setDbtid(String dbtid) { - this.dbtid = dbtid; - } } diff --git a/src/main/java/io/v/nutz/zhgh/jdh/model/gzzl/Jdh_gzzllx.java b/src/main/java/io/v/nutz/zhgh/jdh/model/gzzl/Jdh_gzzllx.java index d36320b..1fd99da 100644 --- a/src/main/java/io/v/nutz/zhgh/jdh/model/gzzl/Jdh_gzzllx.java +++ b/src/main/java/io/v/nutz/zhgh/jdh/model/gzzl/Jdh_gzzllx.java @@ -1,5 +1,6 @@ package io.v.nutz.zhgh.jdh.model.gzzl; +import lombok.Data; import org.nutz.dao.entity.annotation.*; import org.nutz.dao.interceptor.annotation.PrevInsert; @@ -11,6 +12,7 @@ import java.io.Serializable; * @author 赵欣雨 * @date 2020/8/18 9:16 */ +@Data @Table("jdh_gzzllx") public class Jdh_gzzllx implements Serializable { private static final long serialVersionUID = 1L; @@ -36,35 +38,4 @@ public class Jdh_gzzllx implements Serializable { @ColDefine(type = ColType.INT, width = 1) private Integer xh; - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLxname() { - return lxname; - } - - public void setLxname(String lxname) { - this.lxname = lxname; - } - - public Integer getXh() { - return xh; - } - - public void setXh(Integer xh) { - this.xh = xh; - } } diff --git a/src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh2_gzzllx.java b/src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh2_gzzllx.java index 4f74298..a03eb1a 100644 --- a/src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh2_gzzllx.java +++ b/src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh2_gzzllx.java @@ -1,5 +1,6 @@ package io.v.nutz.zhgh.jdh.model.two; +import lombok.Data; import org.nutz.dao.entity.annotation.*; import org.nutz.dao.interceptor.annotation.PrevInsert; @@ -11,6 +12,7 @@ import java.io.Serializable; * @author 赵欣雨 * @date 2020/8/18 9:16 */ +@Data @Table("jdh2_gzzllx") public class Jdh2_gzzllx implements Serializable { private static final long serialVersionUID = 1L; @@ -36,35 +38,4 @@ public class Jdh2_gzzllx implements Serializable { @ColDefine(type = ColType.INT, width = 1) private Integer xh; - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLxname() { - return lxname; - } - - public void setLxname(String lxname) { - this.lxname = lxname; - } - - public Integer getXh() { - return xh; - } - - public void setXh(Integer xh) { - this.xh = xh; - } } diff --git a/src/main/java/io/v/nutz/zhgh/jdh/model/zzjg/Jdh_dbt_zcfgh.java b/src/main/java/io/v/nutz/zhgh/jdh/model/zzjg/Jdh_dbt_zcfgh.java index 09cf40c..71a743b 100644 --- a/src/main/java/io/v/nutz/zhgh/jdh/model/zzjg/Jdh_dbt_zcfgh.java +++ b/src/main/java/io/v/nutz/zhgh/jdh/model/zzjg/Jdh_dbt_zcfgh.java @@ -1,10 +1,11 @@ package io.v.nutz.zhgh.jdh.model.zzjg; +import lombok.Data; import org.nutz.dao.entity.annotation.*; import java.io.Serializable; - +@Data @Table("jdh_dbt_zcfgh") public class Jdh_dbt_zcfgh implements Serializable { private static final long serialVersionUID = 1L; @@ -31,35 +32,4 @@ public class Jdh_dbt_zcfgh implements Serializable { @ColDefine(type = ColType.VARCHAR, width = 32) private String jdhid; - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDbtid() { - return dbtid; - } - - public void setDbtid(String dbtid) { - this.dbtid = dbtid; - } - - public String getFghid() { - return fghid; - } - - public void setFghid(String fghid) { - this.fghid = fghid; - } - - public String getJdhid() { - return jdhid; - } - - public void setJdhid(String jdhid) { - this.jdhid = jdhid; - } } diff --git a/src/main/java/io/v/nutz/zhgh/jdh/services/MeetingLevelTwoService.java b/src/main/java/io/v/nutz/zhgh/jdh/services/MeetingLevelTwoService.java index c1ec04a..5ff1e4f 100644 --- a/src/main/java/io/v/nutz/zhgh/jdh/services/MeetingLevelTwoService.java +++ b/src/main/java/io/v/nutz/zhgh/jdh/services/MeetingLevelTwoService.java @@ -2,9 +2,10 @@ package io.v.nutz.zhgh.jdh.services; import cn.wizzer.framework.base.service.BaseService; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.jdh.model.two.JdhLevel2; -import io.v.nutz.modules.models.PageForm; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.jdh.model.two.JdhLevel2; + /** * @author: Aaron diff --git a/src/main/java/io/v/nutz/zhgh/jdh/services/impl/MeetingLevelTwoServiceImpl.java b/src/main/java/io/v/nutz/zhgh/jdh/services/impl/MeetingLevelTwoServiceImpl.java index 6355b6e..cee8752 100644 --- a/src/main/java/io/v/nutz/zhgh/jdh/services/impl/MeetingLevelTwoServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/jdh/services/impl/MeetingLevelTwoServiceImpl.java @@ -4,12 +4,13 @@ import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; import cn.wizzer.framework.base.service.BaseServiceImpl; import cn.wizzer.framework.page.Pagination; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.FileService; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.jdh.model.two.JdhLevel2; -import io.v.nutz.jdh.services.MeetingLevelTwoService; -import io.v.nutz.modules.models.PageForm; + import io.v.nutz.sys.models.Sys_file; +import io.v.nutz.zhgh.jdh.model.two.JdhLevel2; +import io.v.nutz.zhgh.jdh.services.MeetingLevelTwoService; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; @@ -61,8 +62,8 @@ public class MeetingLevelTwoServiceImpl extends BaseServiceImpl imple if (StrUtil.isNotBlank(page.getSearchName()) && StrUtil.isNotBlank(page.getSearchKeyword())) { cnd.and(Cnd.likeEX(page.getSearchName(), page.getSearchKeyword())); } - cnd.andExcludeEmpty("un.id", "=", unitId); - cnd.andExcludeEmpty("uni.id", "=", unionId); + cnd.andEx("un.id", "=", unitId); + cnd.andEx("uni.id", "=", unionId); cnd.asc("jdh2.audit_state").desc("jdh2.create_time"); sql.setCondition(cnd); return listPage(page.getPageNumber(), page.getPageSize(), sql); diff --git a/src/main/java/io/v/nutz/zhgh/proposal/constants/ProposalAuditEnum.java b/src/main/java/io/v/nutz/zhgh/proposal/constants/ProposalAuditEnum.java index 735617a..3e7c461 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/constants/ProposalAuditEnum.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/constants/ProposalAuditEnum.java @@ -1,16 +1,16 @@ package io.v.nutz.zhgh.proposal.constants; +import io.v.nutz.base.service.ViService; +import io.v.nutz.base.service.impl.ViServiceImpl; import io.v.nutz.base.utils.DateUtil; import io.v.nutz.base.utils.MsgApi; -import io.v.nutz.proposal.models.*; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.proposal.services.ProposalReplyService; -import io.v.nutz.service.ViService; -import io.v.nutz.service.impl.ViServiceImpl; +import io.v.nutz.base.utils.ViResource; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.models.*; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; +import io.v.nutz.zhgh.proposal.services.ProposalReplyService; import io.v.nutz.sys.models.Sys_user; -import io.v.nutz.util.ShiroUtil; -import io.v.nutz.util.ViResource; import lombok.Getter; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/constants/ProposalMannerEnum.java b/src/main/java/io/v/nutz/zhgh/proposal/constants/ProposalMannerEnum.java index 9bd8249..f845131 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/constants/ProposalMannerEnum.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/constants/ProposalMannerEnum.java @@ -1,15 +1,16 @@ package io.v.nutz.zhgh.proposal.constants; import cn.wizzer.framework.base.Result; -import io.v.nutz.proposal.models.ProposalConfig; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalSeconded; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.proposal.services.ProposalSecondedService; -import io.v.nutz.service.ViService; -import io.v.nutz.service.impl.ViServiceImpl; -import io.v.nutz.util.ViResource; +import io.v.nutz.base.service.ViService; +import io.v.nutz.base.service.impl.ViServiceImpl; +import io.v.nutz.base.utils.ViResource; +import io.v.nutz.zhgh.proposal.models.ProposalConfig; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalSeconded; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; +import io.v.nutz.zhgh.proposal.services.ProposalSecondedService; + import lombok.Getter; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/basics/ProposalConfigController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/basics/ProposalConfigController.java index 6ad69da..c76bd50 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/basics/ProposalConfigController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/basics/ProposalConfigController.java @@ -1,10 +1,11 @@ package io.v.nutz.zhgh.proposal.controller.basics; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.proposal.models.ProposalConfig; -import io.v.nutz.proposal.services.ProposalConfigService; + +import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.sys.models.Sys_dict; import io.v.nutz.sys.services.SysDictService; +import io.v.nutz.zhgh.proposal.models.ProposalConfig; +import io.v.nutz.zhgh.proposal.services.ProposalConfigService; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.aop.interceptor.ioc.TransAop; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/basics/ProposalStateController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/basics/ProposalStateController.java index 93365ec..47656fd 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/basics/ProposalStateController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/basics/ProposalStateController.java @@ -3,11 +3,11 @@ package io.v.nutz.zhgh.proposal.controller.basics; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalState; -import io.v.nutz.service.ViService; -import io.v.nutz.web.controllers.platform.sys.SysMenuController; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.ViService; +import io.v.nutz.sys.controllers.platform.sys.SysMenuController; +import io.v.nutz.zhgh.proposal.models.ProposalState; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.aop.interceptor.ioc.TransAop; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/basics/ProposalTypeController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/basics/ProposalTypeController.java index f6eed80..8cd8340 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/basics/ProposalTypeController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/basics/ProposalTypeController.java @@ -1,9 +1,9 @@ package io.v.nutz.zhgh.proposal.controller.basics; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalType; -import io.v.nutz.service.ViService; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.proposal.models.ProposalType; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; import org.nutz.ioc.loader.annotation.Inject; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/basics/ProposalUndertakeController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/basics/ProposalUndertakeController.java index 1479a6c..44bc2a5 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/basics/ProposalUndertakeController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/basics/ProposalUndertakeController.java @@ -2,19 +2,19 @@ package io.v.nutz.zhgh.proposal.controller.basics; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.ViService; import io.v.nutz.base.utils.Roles; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalConfig; -import io.v.nutz.proposal.models.ProposalUndertake; -import io.v.nutz.service.ViService; import io.v.nutz.sys.models.Sys_unit; import io.v.nutz.sys.models.Sys_user_role; import io.v.nutz.sys.services.SysRoleService; import io.v.nutz.sys.services.SysUnitService; import io.v.nutz.sys.services.SysUserRoleService; import io.v.nutz.sys.services.SysUserService; +import io.v.nutz.zhgh.proposal.models.ProposalConfig; +import io.v.nutz.zhgh.proposal.models.ProposalUndertake; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; @@ -313,8 +313,8 @@ public class ProposalUndertakeController { LEFT JOIN proposal_undertake pun ON pun.id = sur.cbdwid $condition """); - cnd.andExcludeEmpty("sur.cbdwid", "=", id); - cnd.andExcludeEmpty("sur.roleId", "=", flag ? Roles.IN_CHARGE_LEADER : Roles.CONTRACTOR_PERSON); + cnd.andEx("sur.cbdwid", "=", id); + cnd.andEx("sur.roleId", "=", flag ? Roles.IN_CHARGE_LEADER : Roles.CONTRACTOR_PERSON); sql.setCondition(cnd); return sysUserService.list(sql); } diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/common/ProposalAgentController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/common/ProposalAgentController.java index f29df35..03ee8be 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/common/ProposalAgentController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/common/ProposalAgentController.java @@ -1,19 +1,19 @@ package io.v.nutz.zhgh.proposal.controller.common; import cn.hutool.core.util.StrUtil; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.utils.Roles; import io.v.nutz.base.utils.Vi; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalReplyConfig; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.proposal.services.ProposalReplyService; import io.v.nutz.sys.models.Sys_menu; import io.v.nutz.sys.models.Sys_user; import io.v.nutz.sys.models.Sys_user_role; -import io.v.nutz.util.ShiroUtil; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalReplyConfig; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; +import io.v.nutz.zhgh.proposal.services.ProposalReplyService; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/common/ProposalCommonController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/common/ProposalCommonController.java index ef190f6..856b6f5 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/common/ProposalCommonController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/common/ProposalCommonController.java @@ -3,22 +3,24 @@ package io.v.nutz.zhgh.proposal.controller.common; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; import cn.wizzer.framework.base.service.BaseService; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.jdh.model.cb.Jdh_jdhxx; -import io.v.nutz.jdh.model.db.Jdh_db; -import io.v.nutz.jdh.model.zzjg.Jdh_dbt; -import io.v.nutz.jdh.model.zzjg.Jdh_jgsz; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.*; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.proposal.services.ProposalReplyService; -import io.v.nutz.service.ViService; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.service.ViService; import io.v.nutz.sys.models.Sys_dict; import io.v.nutz.sys.services.SysDictService; -import io.v.nutz.util.ShiroUtil; + +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.jdh.model.cb.Jdh_jdhxx; +import io.v.nutz.zhgh.jdh.model.db.Jdh_db; +import io.v.nutz.zhgh.jdh.model.zzjg.Jdh_dbt; +import io.v.nutz.zhgh.jdh.model.zzjg.Jdh_jgsz; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.*; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; +import io.v.nutz.zhgh.proposal.services.ProposalReplyService; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; @@ -108,7 +110,7 @@ public class ProposalCommonController { @ViReturn public Object getProposalState(Integer stateCode) { CndPlus cnd = CndPlus.create(); - cnd.andExcludeEmpty("stateCode", "=", stateCode); + cnd.andEx("stateCode", "=", stateCode); cnd.asc("stateCode"); return baseService.dao().query(ProposalState.class, cnd); } @@ -524,7 +526,7 @@ public class ProposalCommonController { * 查询所有状态 * * @return - * @see io.v.nutz.proposal.constants.ProposalState + * @see ProposalState */ @At @ViReturn diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/common/ProposalTaskCommonController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/common/ProposalTaskCommonController.java index 1a6ce22..2b9fa1b 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/common/ProposalTaskCommonController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/common/ProposalTaskCommonController.java @@ -1,9 +1,10 @@ package io.v.nutz.zhgh.proposal.controller.common; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.proposal.models.ProposalSeconded; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.service.ViService; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.proposal.models.ProposalSeconded; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.nutz.dao.Cnd; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportCaseController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportCaseController.java index 69df495..22cb95c 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportCaseController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportCaseController.java @@ -6,17 +6,17 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.Vi; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalExportService; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.util.ShiroUtil; -import io.v.nutz.util.ViTool; +import io.v.nutz.base.utils.ViTool; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalExportService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportLeaderHandleController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportLeaderHandleController.java index 1f9395c..b5c0c9a 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportLeaderHandleController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportLeaderHandleController.java @@ -5,15 +5,15 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.Roles; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.util.ViTool; +import io.v.nutz.base.utils.ViTool; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportSingleController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportSingleController.java index ee6ef55..e62f4d8 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportSingleController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportSingleController.java @@ -2,14 +2,14 @@ package io.v.nutz.zhgh.proposal.controller.export; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.Vi; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalExportService; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.util.ShiroUtil; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalExportService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportSummaryController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportSummaryController.java index c00b55e..bdddb2c 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportSummaryController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportSummaryController.java @@ -7,14 +7,14 @@ import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HtmlUtil; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.Vi; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.util.ShiroUtil; -import io.v.nutz.util.ViTool; +import io.v.nutz.base.utils.ViTool; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportWholeController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportWholeController.java index 9c950ab..1624697 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportWholeController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportWholeController.java @@ -4,15 +4,15 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.ZipUtil; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.Vi; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalExportService; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.util.ShiroUtil; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalExportService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.commons.io.IOUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyFeedbackController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyFeedbackController.java index 429cad1..59b5e01 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyFeedbackController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyFeedbackController.java @@ -1,13 +1,13 @@ package io.v.nutz.zhgh.proposal.controller.senior; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalFeedback; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalProcessService; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalFeedback; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyProposalBasicInfoController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyProposalBasicInfoController.java index 8535b66..05cad1a 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyProposalBasicInfoController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyProposalBasicInfoController.java @@ -1,11 +1,11 @@ package io.v.nutz.zhgh.proposal.controller.senior; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalInfoService; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Dao; import org.nutz.ioc.loader.annotation.Inject; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyProposalStateCodeController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyProposalStateCodeController.java index d4ce7fb..4502c83 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyProposalStateCodeController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyProposalStateCodeController.java @@ -1,12 +1,13 @@ package io.v.nutz.zhgh.proposal.controller.senior; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.models.ProposalSeconded; -import io.v.nutz.proposal.services.ProposalInfoService; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.models.ProposalSeconded; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyResultCodeController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyResultCodeController.java index 58d5105..3f22967 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyResultCodeController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyResultCodeController.java @@ -1,17 +1,17 @@ package io.v.nutz.zhgh.proposal.controller.senior; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.DateUtil; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalCaseService; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalProcessService; import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalCaseService; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Dao; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyUndertakeController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyUndertakeController.java index fb554ad..0a2c1b0 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyUndertakeController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalModifyUndertakeController.java @@ -1,14 +1,15 @@ package io.v.nutz.zhgh.proposal.controller.senior; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalReply; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalInfoService; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalReply; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalProposalDeleteController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalProposalDeleteController.java index 8cbd838..addf06a 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalProposalDeleteController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalProposalDeleteController.java @@ -1,8 +1,8 @@ package io.v.nutz.zhgh.proposal.controller.senior; import cn.wizzer.framework.base.Result; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.proposal.services.ProposalCommonService; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalReTypeController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalReTypeController.java index 7c94139..3d6a052 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalReTypeController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalReTypeController.java @@ -1,10 +1,11 @@ package io.v.nutz.zhgh.proposal.controller.senior; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalInfoService; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalSecondReplyController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalSecondReplyController.java index c54a6d5..16bc377 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalSecondReplyController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalSecondReplyController.java @@ -1,11 +1,11 @@ package io.v.nutz.zhgh.proposal.controller.senior; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalInfoService; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalUrgeController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalUrgeController.java index 9be6e84..e8c306a 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalUrgeController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/senior/ProposalUrgeController.java @@ -1,12 +1,12 @@ package io.v.nutz.zhgh.proposal.controller.senior; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalUrgeService; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; import io.v.nutz.sys.services.SysUserService; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalUrgeService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalComplexDataController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalComplexDataController.java index fd1df0b..887be2e 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalComplexDataController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalComplexDataController.java @@ -1,9 +1,9 @@ package io.v.nutz.zhgh.proposal.controller.statistics; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.jdh.model.cb.Jdh_jdhxx; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.service.ViService; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.jdh.model.cb.Jdh_jdhxx; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalDataBoardController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalDataBoardController.java index f8e78fd..629be06 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalDataBoardController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalDataBoardController.java @@ -1,14 +1,15 @@ package io.v.nutz.zhgh.proposal.controller.statistics; -import io.v.nutz.annontation.ViReturn; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.Vi; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalDataBoardService; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.util.ShiroUtil; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalDataBoardService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalDelegationSumController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalDelegationSumController.java index 080deec..df91ddf 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalDelegationSumController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalDelegationSumController.java @@ -1,14 +1,14 @@ package io.v.nutz.zhgh.proposal.controller.statistics; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.Roles; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.util.ShiroUtil; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; @@ -73,7 +73,7 @@ public class ProposalDelegationSumController { } } - cnd.andExcludeEmpty("dbt.jdhid", "=", meetingId); + cnd.andEx("dbt.jdhid", "=", meetingId); cnd.asc("dbt.`code`"); sql.setCondition(cnd); diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalHandleTypeController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalHandleTypeController.java index 428ac35..6adbdc9 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalHandleTypeController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalHandleTypeController.java @@ -1,10 +1,10 @@ package io.v.nutz.zhgh.proposal.controller.statistics; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.service.BaseService; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.services.ProposalInfoService; import io.v.nutz.sys.models.Sys_dict; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalHandlingProgressController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalHandlingProgressController.java index a0c8593..0335187 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalHandlingProgressController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalHandlingProgressController.java @@ -1,9 +1,9 @@ package io.v.nutz.zhgh.proposal.controller.statistics; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalHandlingProgressService; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalHandlingProgressService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalHistoryController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalHistoryController.java index 7fa233c..c945ff1 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalHistoryController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalHistoryController.java @@ -2,14 +2,14 @@ package io.v.nutz.zhgh.proposal.controller.statistics; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.Vi; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalExportService; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.util.ShiroUtil; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalExportService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalIntegratedChartController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalIntegratedChartController.java index 7e6ba6a..b220696 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalIntegratedChartController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalIntegratedChartController.java @@ -1,8 +1,9 @@ package io.v.nutz.zhgh.proposal.controller.statistics; -import io.v.nutz.annontation.ViReturn; + +import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.utils.Vi; -import io.v.nutz.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalIntegratedController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalIntegratedController.java index 6c9ec28..a8582b3 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalIntegratedController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalIntegratedController.java @@ -1,13 +1,13 @@ package io.v.nutz.zhgh.proposal.controller.statistics; import cn.hutool.core.util.ArrayUtil; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.Vi; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalExportService; -import io.v.nutz.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalExportService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalProgressController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalProgressController.java index 3b3f44c..f764d6b 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalProgressController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalProgressController.java @@ -2,18 +2,19 @@ package io.v.nutz.zhgh.proposal.controller.statistics; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; -import io.v.nutz.annontation.ViReturn; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.Vi; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.jdh.model.db.Jdh_db; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalConfigService; -import io.v.nutz.proposal.services.ProposalExportService; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalProgressService; -import io.v.nutz.util.ShiroUtil; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.jdh.model.db.Jdh_db; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalConfigService; +import io.v.nutz.zhgh.proposal.services.ProposalExportService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalProgressService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; @@ -70,7 +71,7 @@ public class ProposalProgressController { @Param(value = "levyStates", required = false) Integer[] levyStates) { CndPlus cnd = CndPlus.create(); - cnd.andExcludeEmpty("info.stateCode", "=", stateCode); + cnd.andEx("info.stateCode", "=", stateCode); if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "tamange"})) { if (ShiroUtil.hasAnyRoles("jdhdbt01,jdhdbt02")) { @@ -163,9 +164,9 @@ public class ProposalProgressController { group.orLike("su.loginname", search.getCreateUser()); cnd.and(group); } - cnd.andExcludeEmpty("info.delegationId", "=", search.getDelegationId()); - cnd.andExcludeEmpty("su.unionId", "=", search.getUnionId()); - cnd.andExcludeEmpty("su.unitId", "=", search.getUnitId()); + cnd.andEx("info.delegationId", "=", search.getDelegationId()); + cnd.andEx("su.unionId", "=", search.getUnionId()); + cnd.andEx("su.unitId", "=", search.getUnitId()); cnd.groupBy("info.id"); cnd.desc("info.proposalCode"); sql.setCondition(cnd); diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalSummaryController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalSummaryController.java index 127738a..01f8ee6 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalSummaryController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalSummaryController.java @@ -4,17 +4,18 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; -import io.v.nutz.annontation.ViReturn; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.OfficeTemplateUtil; import io.v.nutz.base.utils.Vi; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.jdh.model.cb.Jdh_jdhxx; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalExportService; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.util.ShiroUtil; -import io.v.nutz.util.ViTool; +import io.v.nutz.base.utils.ViTool; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.jdh.model.cb.Jdh_jdhxx; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalExportService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import lombok.Data; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -148,10 +149,10 @@ public class ProposalSummaryController { $condition """); - cnd.andExcludeEmpty("info.teacherMeetingId", "=", meetingId); - cnd.andExcludeEmpty("info.stateCode", "=", stateCode); - cnd.andExcludeEmpty("info.delegationId", "=", delegationId); - cnd.andExcludeEmpty("info.typeId", "=", typeId); + cnd.andEx("info.teacherMeetingId", "=", meetingId); + cnd.andEx("info.stateCode", "=", stateCode); + cnd.andEx("info.delegationId", "=", delegationId); + cnd.andEx("info.typeId", "=", typeId); cnd.groupBy("pr.proposalId"); sql.setCondition(cnd); @@ -215,8 +216,8 @@ public class ProposalSummaryController { $condition """); - cnd.andExcludeEmpty("info.teacherMeetingId", "=", meetingId); - cnd.andExcludeEmpty("pru.undertakeId", "=", undertakeId); + cnd.andEx("info.teacherMeetingId", "=", meetingId); + cnd.andEx("pru.undertakeId", "=", undertakeId); cnd.groupBy("pru.proposalId"); sql.setCondition(cnd); List exportList = proposalInfoService.listEntity(sql, ExportEntity.class); diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalUnderTakeSummaryController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalUnderTakeSummaryController.java index 0c72b54..cab4976 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalUnderTakeSummaryController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalUnderTakeSummaryController.java @@ -1,20 +1,21 @@ package io.v.nutz.zhgh.proposal.controller.statistics; import cn.hutool.core.util.StrUtil; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.ViService; import io.v.nutz.base.utils.ExcelUtils; import io.v.nutz.base.utils.Roles; import io.v.nutz.base.utils.Vi; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.jdh.model.cb.Jdh_jdhxx; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.models.ProposalConfig; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.models.ProposalState; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.service.ViService; +import io.v.nutz.zhgh.jdh.model.cb.Jdh_jdhxx; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalConfig; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; + +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; @@ -157,7 +158,7 @@ public class ProposalUnderTakeSummaryController { CndPlus cndPlus = CndPlus.create(); cndPlus.and("info.resultCode", "in", Lang.array(ProposalConstant.DETERMINE, ProposalConstant.OPINION)); - cndPlus.andExcludeEmpty("info.teacherMeetingId", "=", meetingId); + cndPlus.andEx("info.teacherMeetingId", "=", meetingId); if (Strings.isNotBlank(unitId)) { SqlExpressionGroup group = new SqlExpressionGroup(); @@ -171,7 +172,7 @@ public class ProposalUnderTakeSummaryController { proposalInfoService.sortAndSearch(cndPlus, pageForm, new ProposalSearch()); sql.setCondition(cndPlus); List list = proposalInfoService.listMap(sql); - ProposalState caseCheckState = dao.fetch(ProposalState.class, Cnd.where("stateCode", "=", io.v.nutz.proposal.constants.ProposalState.CASE_CHECK)); + io.v.nutz.zhgh.proposal.models.ProposalState caseCheckState = dao.fetch(io.v.nutz.zhgh.proposal.models.ProposalState.class, Cnd.where("stateCode", "=", ProposalState.CASE_CHECK)); list.forEach(v -> { if (v.getInt("replyNumber") == 1 || v.getInt("caseCheckNeedSecondAudit") == 0) { v.put("pruMasterLeaderIsAudit", v.getInt("isLeaderAudit") == 1 ? "已审批" : "未审批"); @@ -243,12 +244,15 @@ public class ProposalUnderTakeSummaryController { } catch (Exception e) { e.printStackTrace(); } finally { - if (inputStream != null) + if (inputStream != null) { inputStream.close(); - if (out != null) + } + if (out != null) { out.close(); - if (file != null) + } + if (file != null) { file.delete(); // 删除临时文件 + } } } diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalUndertakeReplyController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalUndertakeReplyController.java index cd420f4..76ad7bd 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalUndertakeReplyController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalUndertakeReplyController.java @@ -1,11 +1,11 @@ package io.v.nutz.zhgh.proposal.controller.statistics; import cn.hutool.core.util.StrUtil; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalConfig; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.services.ProposalInfoService; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalConfig; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalUndertakeSatisfactionController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalUndertakeSatisfactionController.java index 5d7bbb6..3f94802 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalUndertakeSatisfactionController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalUndertakeSatisfactionController.java @@ -1,11 +1,11 @@ package io.v.nutz.zhgh.proposal.controller.statistics; import cn.hutool.core.util.StrUtil; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.models.ProposalConfig; -import io.v.nutz.proposal.services.ProposalInfoService; +import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.sys.models.Sys_dict; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.models.ProposalConfig; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalYearReportController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalYearReportController.java index 407a5b1..12771c9 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalYearReportController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalYearReportController.java @@ -4,16 +4,16 @@ import cn.hutool.core.util.ArrayUtil; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.policy.HackLoopTableRenderPolicy; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.Html2Text; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.jdh.model.cb.Jdh_jdhxx; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.jdh.model.cb.Jdh_jdhxx; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import io.v.nutz.web.commons.base.Globals; import io.v.nutz.web.commons.ext.beetl.Html2TxtFormat; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -110,7 +110,7 @@ public class ProposalYearReportController { info.createTime DESC """); CndPlus cnd = CndPlus.create(); -// cnd.andExcludeEmpty("info.teacherMeetingId", "=", search.getMeetingId()); +// cnd.andEx("info.teacherMeetingId", "=", search.getMeetingId()); // cnd.and("info.resultCode", "is not", null); cnd.andEX("info.stateCode", "=", stateCode); diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalAllFinishedQueryController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalAllFinishedQueryController.java index a1732fa..add9bdb 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalAllFinishedQueryController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalAllFinishedQueryController.java @@ -1,15 +1,16 @@ package io.v.nutz.zhgh.proposal.controller.transact; import cn.hutool.core.util.StrUtil; -import io.v.nutz.annontation.ViReturn; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.Vi; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.jdh.model.db.Jdh_db; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.util.ShiroUtil; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.jdh.model.db.Jdh_db; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; @@ -55,7 +56,7 @@ public class ProposalAllFinishedQueryController { @Param(value = "searchKeyword2",required = false)String searchKeyword2) { CndPlus cnd = CndPlus.create(); - cnd.andExcludeEmpty("info.stateCode", "=", stateCode); + cnd.andEx("info.stateCode", "=", stateCode); if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "tamange"})) { if (ShiroUtil.hasAnyRoles("jdhdbt01,jdhdbt02")) { @@ -146,9 +147,9 @@ public class ProposalAllFinishedQueryController { group.orLike("su.loginname", search.getCreateUser()); cnd.and(group); } - cnd.andExcludeEmpty("info.delegationId", "=", search.getDelegationId()); - cnd.andExcludeEmpty("su.unionId", "=", search.getUnionId()); - cnd.andExcludeEmpty("su.unitId", "=", search.getUnitId()); + cnd.andEx("info.delegationId", "=", search.getDelegationId()); + cnd.andEx("su.unionId", "=", search.getUnionId()); + cnd.andEx("su.unitId", "=", search.getUnitId()); cnd.groupBy("info.id"); cnd.desc("info.proposalCode"); sql.setCondition(cnd); diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalAuditController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalAuditController.java index 60c0a21..5bf972a 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalAuditController.java @@ -1,14 +1,15 @@ package io.v.nutz.zhgh.proposal.controller.transact; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.lang.Enum; -import io.v.nutz.proposal.constants.ProposalAuditEnum; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalReply; -import io.v.nutz.proposal.services.ProposalInfoService; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.lang.Enum; import io.v.nutz.sys.models.Sys_signature; import io.v.nutz.sys.services.SysSignatureService; -import io.v.nutz.util.ShiroUtil; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalAuditEnum; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalReply; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.ioc.aop.Aop; @@ -20,6 +21,7 @@ import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; + /** * 提案审核流程 */ diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalBranchLeaderReadController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalBranchLeaderReadController.java index e666f40..d19536b 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalBranchLeaderReadController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalBranchLeaderReadController.java @@ -1,18 +1,18 @@ package io.v.nutz.zhgh.proposal.controller.transact; import cn.wizzer.framework.base.Result; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.*; -import io.v.nutz.proposal.services.ProposalBranchLeaderReadService; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalProcessService; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; import io.v.nutz.sys.models.Sys_signature; import io.v.nutz.sys.services.SysSignatureService; -import io.v.nutz.util.ShiroUtil; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.*; +import io.v.nutz.zhgh.proposal.services.ProposalBranchLeaderReadService; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseCheckController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseCheckController.java index abd392a..c690242 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseCheckController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseCheckController.java @@ -1,14 +1,15 @@ package io.v.nutz.zhgh.proposal.controller.transact; import cn.hutool.core.util.StrUtil; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalCaseCheckService; -import io.v.nutz.proposal.services.ProposalCommonService; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; import io.v.nutz.sys.models.Sys_signature; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalCaseCheckService; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseController.java index a40fa73..da0b735 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseController.java @@ -5,13 +5,14 @@ import cn.wizzer.framework.base.Result; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.policy.HackLoopTableRenderPolicy; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalAuditService; -import io.v.nutz.proposal.services.ProposalCaseService; -import io.v.nutz.proposal.services.ProposalInfoService; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalAuditService; +import io.v.nutz.zhgh.proposal.services.ProposalCaseService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import io.v.nutz.sys.models.Sys_signature; import io.v.nutz.web.commons.base.Globals; import org.apache.shiro.authz.annotation.Logical; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseFiledController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseFiledController.java index a065e77..2bd8605 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseFiledController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseFiledController.java @@ -2,13 +2,14 @@ package io.v.nutz.zhgh.proposal.controller.transact; import cn.hutool.core.util.StrUtil; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalCaseFiledService; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalInfoService; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalCaseFiledService; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import io.v.nutz.sys.models.Sys_signature; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Dao; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseReadController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseReadController.java index 1719d8f..12214d8 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseReadController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseReadController.java @@ -3,22 +3,21 @@ package io.v.nutz.zhgh.proposal.controller.transact; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.MsgApi; import io.v.nutz.base.utils.Roles; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import io.v.nutz.sys.models.Sys_signature; import io.v.nutz.sys.models.Sys_user_role; import io.v.nutz.sys.models.User; import io.v.nutz.sys.services.SysSignatureService; -import io.v.nutz.util.ShiroUtil; import io.v.nutz.web.commons.base.Globals; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; @@ -39,6 +38,8 @@ import org.nutz.mvc.annotation.Param; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; +import io.v.nutz.web.commons.utils.ShiroUtil; + @IocBean @At("/platform/proposal/transact/caseRead") diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseUnitController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseUnitController.java index d92f739..4f0062a 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseUnitController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCaseUnitController.java @@ -1,15 +1,17 @@ package io.v.nutz.zhgh.proposal.controller.transact; import cn.hutool.core.util.StrUtil; -import io.v.nutz.annontation.ViReturn; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.Roles; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalReply; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalCaseConfirmService; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalInfoService; + +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalReply; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalCaseConfirmService; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import io.v.nutz.sys.models.Sys_signature; import io.v.nutz.sys.models.Sys_user_role; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCommitteeAuditController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCommitteeAuditController.java index ec4c7e4..7d89dd6 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCommitteeAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalCommitteeAuditController.java @@ -1,11 +1,13 @@ package io.v.nutz.zhgh.proposal.controller.transact; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalInfoService; + + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalDelegationHeadController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalDelegationHeadController.java index b0f3326..22bdd56 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalDelegationHeadController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalDelegationHeadController.java @@ -6,19 +6,20 @@ import cn.hutool.core.util.ZipUtil; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.policy.HackLoopTableRenderPolicy; -import io.v.nutz.annontation.ViReturn; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.Html2Text; import io.v.nutz.base.utils.MsgApi; import io.v.nutz.base.utils.Roles; import io.v.nutz.base.utils.Vi; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.jdh.model.cb.Jdh_jdhxx; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalInfoService; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.jdh.model.cb.Jdh_jdhxx; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import io.v.nutz.sys.models.Sys_signature; -import io.v.nutz.util.ShiroUtil; import io.v.nutz.web.commons.base.Globals; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalExecutorReadConfirmController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalExecutorReadConfirmController.java index 06d701e..ceae02f 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalExecutorReadConfirmController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalExecutorReadConfirmController.java @@ -2,13 +2,13 @@ package io.v.nutz.zhgh.proposal.controller.transact; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.*; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.*; import io.v.nutz.sys.models.Sys_signature; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.nutz.aop.interceptor.ioc.TransAop; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalExecutorReadController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalExecutorReadController.java index 9196bff..3739605 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalExecutorReadController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalExecutorReadController.java @@ -2,16 +2,17 @@ package io.v.nutz.zhgh.proposal.controller.transact; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalExecutorReadService; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalProcessService; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalExecutorReadService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import io.v.nutz.sys.models.Sys_signature; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Dao; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalFeedbackScoreController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalFeedbackScoreController.java index 6ab1e4d..c213743 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalFeedbackScoreController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalFeedbackScoreController.java @@ -7,24 +7,26 @@ import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.data.PictureRenderData; import com.deepoove.poi.policy.HackLoopTableRenderPolicy; -import io.v.nutz.annontation.ViReturn; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.ViService; import io.v.nutz.base.utils.Html2Text; import io.v.nutz.base.utils.MsgApi; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalAuditEnum; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.ProposalFeedback; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.proposal.services.ProposalReplyService; -import io.v.nutz.service.ViService; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalAuditEnum; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.ProposalFeedback; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; +import io.v.nutz.zhgh.proposal.services.ProposalReplyService; + import io.v.nutz.sys.models.Sys_signature; import io.v.nutz.sys.services.SysSignatureService; -import io.v.nutz.util.ShiroUtil; import io.v.nutz.web.commons.base.Globals; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalLeaderAuditController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalLeaderAuditController.java index 8435657..3ccd426 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalLeaderAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalLeaderAuditController.java @@ -2,22 +2,24 @@ package io.v.nutz.zhgh.proposal.controller.transact; import cn.hutool.core.lang.Assert; import cn.wizzer.framework.base.Result; -import io.v.nutz.annontation.ViReturn; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.DateUtil; import io.v.nutz.base.utils.MsgApi; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalReply; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalLeaderAuditService; -import io.v.nutz.proposal.services.ProposalProcessService; + +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalReply; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalLeaderAuditService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import io.v.nutz.sys.models.Sys_signature; import io.v.nutz.sys.services.SysSignatureService; -import io.v.nutz.util.ShiroUtil; import io.v.nutz.web.commons.base.Globals; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Chain; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalLeaderSeeController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalLeaderSeeController.java index c848ead..1ae9b48 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalLeaderSeeController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalLeaderSeeController.java @@ -1,10 +1,13 @@ package io.v.nutz.zhgh.proposal.controller.transact; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalInfoService; + + + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalMineController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalMineController.java index eadd35e..4722063 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalMineController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalMineController.java @@ -2,26 +2,29 @@ package io.v.nutz.zhgh.proposal.controller.transact; import cn.wizzer.framework.base.Result; import cn.wizzer.framework.base.service.BaseService; -import io.v.nutz.annontation.ViReturn; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.ViService; import io.v.nutz.base.utils.DateUtil; import io.v.nutz.base.utils.Roles; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalMannerEnum; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.models.ProposalSeconded; -import io.v.nutz.proposal.services.ProposalImportService; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.service.ViService; + + +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalMannerEnum; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.models.ProposalSeconded; +import io.v.nutz.zhgh.proposal.services.ProposalImportService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import io.v.nutz.sys.models.Sys_signature; import io.v.nutz.sys.models.Sys_user; import io.v.nutz.sys.services.SysSignatureService; import io.v.nutz.sys.services.SysUserService; -import io.v.nutz.util.ShiroUtil; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.aop.interceptor.ioc.TransAop; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalPartyOrganizationController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalPartyOrganizationController.java index 0c0103e..8aa3a05 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalPartyOrganizationController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalPartyOrganizationController.java @@ -3,16 +3,18 @@ package io.v.nutz.zhgh.proposal.controller.transact; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.annontation.ViReturn; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.Vi; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalProcessService; + +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import io.v.nutz.sys.models.Sys_signature; import io.v.nutz.web.commons.utils.ShiroUtil; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalPreAuditController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalPreAuditController.java index 7acbf3e..d541fa5 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalPreAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalPreAuditController.java @@ -1,11 +1,12 @@ package io.v.nutz.zhgh.proposal.controller.transact; import cn.hutool.core.util.StrUtil; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalPreAuditService; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalPreAuditService; import io.v.nutz.sys.models.Sys_signature; import io.v.nutz.web.commons.utils.ShiroUtil; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalPrincipalReadController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalPrincipalReadController.java index d5ea975..fbe5bf9 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalPrincipalReadController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalPrincipalReadController.java @@ -2,16 +2,16 @@ package io.v.nutz.zhgh.proposal.controller.transact; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; -import io.v.nutz.annontation.ViReturn; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalPrincipalReadService; -import io.v.nutz.proposal.services.ProposalProcessService; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalPrincipalReadService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import io.v.nutz.sys.models.Sys_signature; import io.v.nutz.web.commons.utils.ShiroUtil; import org.apache.shiro.authz.annotation.RequiresAuthentication; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalReplyController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalReplyController.java index aba78bf..069fca8 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalReplyController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalReplyController.java @@ -6,19 +6,19 @@ import cn.wizzer.framework.base.Result; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.policy.HackLoopTableRenderPolicy; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.DateUtil; import io.v.nutz.base.utils.Html2Text; import io.v.nutz.base.utils.MsgApi; import io.v.nutz.base.utils.Vi; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.*; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.proposal.services.ProposalReplyService; -import io.v.nutz.util.ShiroUtil; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.*; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; +import io.v.nutz.zhgh.proposal.services.ProposalReplyService; import io.v.nutz.web.commons.base.Globals; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Chain; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalSecondaryUnitController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalSecondaryUnitController.java index 217d6d2..7e54294 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalSecondaryUnitController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalSecondaryUnitController.java @@ -3,16 +3,16 @@ package io.v.nutz.zhgh.proposal.controller.transact; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.Vi; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalProcessService; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import io.v.nutz.sys.models.Sys_signature; import io.v.nutz.web.commons.utils.ShiroUtil; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalSecondedController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalSecondedController.java index e163bac..7e4f0cc 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalSecondedController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalSecondedController.java @@ -1,24 +1,24 @@ package io.v.nutz.zhgh.proposal.controller.transact; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.DateUtil; import io.v.nutz.base.utils.MsgApi; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.mode.ProposalSubmitMode; -import io.v.nutz.proposal.models.ProposalConfig; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.models.ProposalSeconded; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.proposal.services.ProposalSecondedService; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.mode.ProposalSubmitMode; +import io.v.nutz.zhgh.proposal.models.ProposalConfig; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.models.ProposalSeconded; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; +import io.v.nutz.zhgh.proposal.services.ProposalSecondedService; import io.v.nutz.sys.models.Sys_signature; import io.v.nutz.sys.services.SysSignatureService; -import io.v.nutz.util.ShiroUtil; import io.v.nutz.web.commons.base.Globals; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.aop.interceptor.ioc.TransAop; @@ -127,10 +127,10 @@ public class ProposalSecondedController { group.orLike("su.loginname", search.getCreateUser()); cnd.and(group); } - cnd.andExcludeEmpty("info.teacherMeetingId", "=", search.getMeetingId()); - cnd.andExcludeEmpty("info.delegationId", "=", search.getDelegationId()); - cnd.andExcludeEmpty("su.unionId", "=", search.getUnionId()); - cnd.andExcludeEmpty("su.unitId", "=", search.getUnitId()); + cnd.andEx("info.teacherMeetingId", "=", search.getMeetingId()); + cnd.andEx("info.delegationId", "=", search.getDelegationId()); + cnd.andEx("su.unionId", "=", search.getUnionId()); + cnd.andEx("su.unitId", "=", search.getUnitId()); if (ShiroUtil.hasRole("sysadmin")) { cnd.groupBy("info.id"); } diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalUnderTakeReadController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalUnderTakeReadController.java index dd3b828..006793d 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalUnderTakeReadController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalUnderTakeReadController.java @@ -3,17 +3,18 @@ package io.v.nutz.zhgh.proposal.controller.transact; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.policy.HackLoopTableRenderPolicy; -import io.v.nutz.annontation.ViReturn; + +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.DateUtil; import io.v.nutz.base.utils.Html2Text; import io.v.nutz.base.utils.Roles; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.models.ProposalUnderTakeFirstOpinion; -import io.v.nutz.proposal.services.ProposalInfoService; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.models.ProposalUnderTakeFirstOpinion; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import io.v.nutz.sys.models.Sys_user_role; -import io.v.nutz.util.ShiroUtil; import io.v.nutz.web.commons.base.Globals; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalWriteController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalWriteController.java index efd228f..2b6fc2f 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalWriteController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalWriteController.java @@ -1,16 +1,17 @@ package io.v.nutz.zhgh.proposal.controller.transact; -import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.service.BaseService; import io.v.nutz.base.utils.DateUtil; import io.v.nutz.base.utils.Roles; -import io.v.nutz.proposal.constants.ProposalMannerEnum; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.services.ProposalInfoService; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalMannerEnum; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import io.v.nutz.sys.models.Sys_signature; import io.v.nutz.sys.models.Sys_user_role; -import io.v.nutz.util.ShiroUtil; + import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/mode/ProposalSubmitMode.java b/src/main/java/io/v/nutz/zhgh/proposal/mode/ProposalSubmitMode.java index a30c5a6..77d0e41 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/mode/ProposalSubmitMode.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/mode/ProposalSubmitMode.java @@ -1,6 +1,7 @@ package io.v.nutz.zhgh.proposal.mode; -import io.v.nutz.annontation.SelectEnum; + +import io.v.nutz.base.annontation.SelectEnum; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalAuditService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalAuditService.java index 4564696..3148139 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalAuditService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalAuditService.java @@ -1,7 +1,8 @@ package io.v.nutz.zhgh.proposal.services; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.service.ViService; + +import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; /** * @author: Aaron diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalBranchLeaderReadService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalBranchLeaderReadService.java index 30f5c13..a716991 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalBranchLeaderReadService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalBranchLeaderReadService.java @@ -1,9 +1,10 @@ package io.v.nutz.zhgh.proposal.services; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.service.ViService; + +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; import org.nutz.dao.Cnd; /** diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCaseCheckService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCaseCheckService.java index 7b6210a..49c63a7 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCaseCheckService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCaseCheckService.java @@ -1,10 +1,11 @@ package io.v.nutz.zhgh.proposal.services; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.service.ViService; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; + import java.util.List; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCaseConfirmService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCaseConfirmService.java index 1332f02..15a0862 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCaseConfirmService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCaseConfirmService.java @@ -1,10 +1,11 @@ package io.v.nutz.zhgh.proposal.services; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.service.ViService; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; + import java.util.List; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCaseFiledService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCaseFiledService.java index a9122d9..04de71d 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCaseFiledService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCaseFiledService.java @@ -1,10 +1,11 @@ package io.v.nutz.zhgh.proposal.services; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.service.ViService; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; + import java.util.List; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCaseService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCaseService.java index 291c55c..161315e 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCaseService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCaseService.java @@ -1,10 +1,11 @@ package io.v.nutz.zhgh.proposal.services; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.service.ViService; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; + import java.util.List; import java.util.Map; @@ -36,7 +37,7 @@ public interface ProposalCaseService extends ViService { * @param audit 审核通用对象 * @param auditType 审核类型，one=>页面点击行内审核按钮，进行单个审核，many=>并案审核 */ - void audit(List proposalIds, String resultCode, String determineTypeCode, String hostUnit, List helpUnits, String typeId, ProposalAudit audit, String auditType,int flag); + void audit(List proposalIds, String resultCode, String determineTypeCode, String hostUnit, List helpUnits, String typeId, ProposalAudit audit, String auditType, int flag); /** * 编辑 这里只做删除清空工作 清空了再调用audit方法 (●'◡'●) diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCommonService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCommonService.java index dfb4fde..d02c3f0 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCommonService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalCommonService.java @@ -1,8 +1,9 @@ package io.v.nutz.zhgh.proposal.services; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.service.ViService; + +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; import org.nutz.dao.Cnd; import org.nutz.lang.util.NutMap; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalConfigService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalConfigService.java index be684be..c27a088 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalConfigService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalConfigService.java @@ -1,6 +1,7 @@ package io.v.nutz.zhgh.proposal.services; -import io.v.nutz.proposal.models.ProposalConfig; + +import io.v.nutz.zhgh.proposal.models.ProposalConfig; /** * @author zxy diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalDataBoardService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalDataBoardService.java index ad33396..2dc3436 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalDataBoardService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalDataBoardService.java @@ -1,8 +1,8 @@ package io.v.nutz.zhgh.proposal.services; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalSearch; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; import org.nutz.lang.util.NutMap; public interface ProposalDataBoardService { diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalExecutorReadConfirmService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalExecutorReadConfirmService.java index 53bba0c..54b4d87 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalExecutorReadConfirmService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalExecutorReadConfirmService.java @@ -1,6 +1,8 @@ package io.v.nutz.zhgh.proposal.services; -import io.v.nutz.proposal.models.ProposalAudit; + + +import io.v.nutz.zhgh.proposal.models.ProposalAudit; import java.util.List; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalExecutorReadService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalExecutorReadService.java index 8bbda39..8c3d3f0 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalExecutorReadService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalExecutorReadService.java @@ -1,6 +1,7 @@ package io.v.nutz.zhgh.proposal.services; -import io.v.nutz.proposal.models.ProposalAudit; + +import io.v.nutz.zhgh.proposal.models.ProposalAudit; import java.util.List; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalFeedBackService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalFeedBackService.java index adc856c..2fca222 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalFeedBackService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalFeedBackService.java @@ -1,7 +1,8 @@ package io.v.nutz.zhgh.proposal.services; -import io.v.nutz.proposal.models.ProposalFeedback; -import io.v.nutz.service.ViService; + +import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.proposal.models.ProposalFeedback; import org.nutz.lang.util.NutMap; import java.util.List; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalHandlingProgressService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalHandlingProgressService.java index 48ca661..e87d455 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalHandlingProgressService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalHandlingProgressService.java @@ -1,9 +1,9 @@ package io.v.nutz.zhgh.proposal.services; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.service.ViService; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; import org.nutz.lang.util.NutMap; import java.util.List; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalInfoService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalInfoService.java index a560992..7d2f0f0 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalInfoService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalInfoService.java @@ -1,11 +1,12 @@ package io.v.nutz.zhgh.proposal.services; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.models.ProposalState; -import io.v.nutz.service.ViService; + +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.models.ProposalState; import org.nutz.dao.Cnd; import org.nutz.dao.sql.Sql; import org.nutz.lang.util.NutMap; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalLeaderAuditService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalLeaderAuditService.java index 2f4e432..2132a9d 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalLeaderAuditService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalLeaderAuditService.java @@ -1,10 +1,11 @@ package io.v.nutz.zhgh.proposal.services; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalReply; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.service.ViService; + +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.proposal.models.ProposalReply; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; import org.nutz.dao.Cnd; import org.nutz.lang.util.NutMap; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalPreAuditService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalPreAuditService.java index 2ab0179..38a4dbd 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalPreAuditService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalPreAuditService.java @@ -1,9 +1,9 @@ package io.v.nutz.zhgh.proposal.services; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalSearch; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; public interface ProposalPreAuditService { diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalPrincipalReadService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalPrincipalReadService.java index 061830b..60912d3 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalPrincipalReadService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalPrincipalReadService.java @@ -1,7 +1,9 @@ package io.v.nutz.zhgh.proposal.services; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.service.ViService; + + +import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; import java.util.List; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalProcessService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalProcessService.java index 5b8d0c9..3b2ec46 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalProcessService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalProcessService.java @@ -1,12 +1,13 @@ package io.v.nutz.zhgh.proposal.services; import cn.hutool.core.util.StrUtil; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.ProposalConfig; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalState; + import io.v.nutz.sys.models.Sys_user_role; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.ProposalConfig; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalState; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalReplyService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalReplyService.java index 1cc67c9..c092db3 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalReplyService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalReplyService.java @@ -2,11 +2,12 @@ package io.v.nutz.zhgh.proposal.services; import cn.wizzer.framework.base.Result; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.ProposalReply; -import io.v.nutz.proposal.models.ProposalReplyForward; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.service.ViService; + +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.proposal.models.ProposalReply; +import io.v.nutz.zhgh.proposal.models.ProposalReplyForward; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; import org.nutz.dao.Cnd; import org.nutz.lang.util.NutMap; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalUrgeService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalUrgeService.java index fa0061b..bf0c161 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalUrgeService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalUrgeService.java @@ -1,7 +1,8 @@ package io.v.nutz.zhgh.proposal.services; -import io.v.nutz.proposal.models.ProposalUrge; -import io.v.nutz.service.ViService; + +import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.proposal.models.ProposalUrge; /** * @author: Aaron diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalAuditServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalAuditServiceImpl.java index 43c032d..b1a651f 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalAuditServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalAuditServiceImpl.java @@ -1,8 +1,9 @@ package io.v.nutz.zhgh.proposal.services.impl; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.services.ProposalAuditService; -import io.v.nutz.service.impl.ViServiceImpl; + +import io.v.nutz.base.service.impl.ViServiceImpl; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.services.ProposalAuditService; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalBranchLeaderReadServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalBranchLeaderReadServiceImpl.java index 5e170ac..c397997 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalBranchLeaderReadServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalBranchLeaderReadServiceImpl.java @@ -1,16 +1,16 @@ package io.v.nutz.zhgh.proposal.services.impl; import cn.wizzer.framework.page.Pagination; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.impl.ViServiceImpl; import io.v.nutz.base.utils.Roles; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalBranchLeaderReadService; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.service.impl.ViServiceImpl; import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalBranchLeaderReadService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCaseCheckServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCaseCheckServiceImpl.java index bd5ead8..5edece1 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCaseCheckServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCaseCheckServiceImpl.java @@ -1,17 +1,18 @@ package io.v.nutz.zhgh.proposal.services.impl; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalReply; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalCaseCheckService; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.service.impl.ViServiceImpl; + +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.impl.ViServiceImpl; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalReply; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalCaseCheckService; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCaseConfirmServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCaseConfirmServiceImpl.java index eefbbe4..a905158 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCaseConfirmServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCaseConfirmServiceImpl.java @@ -2,16 +2,17 @@ package io.v.nutz.zhgh.proposal.services.impl; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.*; -import io.v.nutz.proposal.services.ProposalCaseConfirmService; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.service.impl.ViServiceImpl; + +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.impl.ViServiceImpl; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.*; +import io.v.nutz.zhgh.proposal.services.ProposalCaseConfirmService; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import lombok.extern.slf4j.Slf4j; import org.nutz.dao.*; import org.nutz.dao.sql.Sql; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCaseFiledServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCaseFiledServiceImpl.java index 373a8b1..c308088 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCaseFiledServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCaseFiledServiceImpl.java @@ -1,17 +1,18 @@ package io.v.nutz.zhgh.proposal.services.impl; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalReply; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalCaseFiledService; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.service.impl.ViServiceImpl; + +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.impl.ViServiceImpl; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalReply; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalCaseFiledService; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCaseServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCaseServiceImpl.java index 1f2a22d..c250380 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCaseServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCaseServiceImpl.java @@ -3,16 +3,17 @@ package io.v.nutz.zhgh.proposal.services.impl; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.page.Pagination; import com.alibaba.fastjson.JSONArray; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.*; -import io.v.nutz.proposal.services.ProposalAuditService; -import io.v.nutz.proposal.services.ProposalCaseService; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.service.impl.ViServiceImpl; + +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.impl.ViServiceImpl; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.*; +import io.v.nutz.zhgh.proposal.services.ProposalAuditService; +import io.v.nutz.zhgh.proposal.services.ProposalCaseService; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import lombok.extern.slf4j.Slf4j; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.*; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCommonServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCommonServiceImpl.java index 7d79942..ad6bcac 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCommonServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalCommonServiceImpl.java @@ -2,15 +2,16 @@ package io.v.nutz.zhgh.proposal.services.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.impl.ViServiceImpl; import io.v.nutz.base.utils.Roles; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.models.*; -import io.v.nutz.proposal.services.ProposalAuditService; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalFeedBackService; -import io.v.nutz.proposal.services.ProposalReplyService; -import io.v.nutz.service.impl.ViServiceImpl; + import io.v.nutz.sys.models.Sys_user_role; +import io.v.nutz.zhgh.proposal.models.*; +import io.v.nutz.zhgh.proposal.services.ProposalAuditService; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalFeedBackService; +import io.v.nutz.zhgh.proposal.services.ProposalReplyService; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalConfigServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalConfigServiceImpl.java index 8cc83e5..b60b72a 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalConfigServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalConfigServiceImpl.java @@ -1,14 +1,15 @@ package io.v.nutz.zhgh.proposal.services.impl; import cn.hutool.core.util.StrUtil; -import io.v.nutz.jdh.model.cb.Jdh_jdhxx; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalConfig; -import io.v.nutz.proposal.services.ProposalConfigService; -import io.v.nutz.service.impl.ViServiceImpl; + +import io.v.nutz.base.service.impl.ViServiceImpl; import io.v.nutz.sys.models.Sys_dict; import io.v.nutz.sys.services.SysDictService; import io.v.nutz.task.services.TaskPlatformService; +import io.v.nutz.zhgh.jdh.model.cb.Jdh_jdhxx; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalConfig; +import io.v.nutz.zhgh.proposal.services.ProposalConfigService; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalDataBoardServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalDataBoardServiceImpl.java index e229657..50cd35e 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalDataBoardServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalDataBoardServiceImpl.java @@ -1,15 +1,16 @@ package io.v.nutz.zhgh.proposal.services.impl; import cn.wizzer.framework.page.Pagination; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.impl.ViServiceImpl; import io.v.nutz.base.utils.Vi; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalDataBoardService; -import io.v.nutz.proposal.services.ProposalHandlingProgressService; -import io.v.nutz.service.impl.ViServiceImpl; -import io.v.nutz.util.ShiroUtil; +; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalDataBoardService; +import io.v.nutz.zhgh.proposal.services.ProposalHandlingProgressService; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalExecutorReadConfirmServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalExecutorReadConfirmServiceImpl.java index 06c3019..5087b3b 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalExecutorReadConfirmServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalExecutorReadConfirmServiceImpl.java @@ -1,13 +1,13 @@ package io.v.nutz.zhgh.proposal.services.impl; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalExecutorReadConfirmService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.service.impl.ViServiceImpl; +import io.v.nutz.base.service.impl.ViServiceImpl; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalExecutorReadConfirmService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import lombok.extern.slf4j.Slf4j; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalExecutorReadServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalExecutorReadServiceImpl.java index e2d4c79..81731a6 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalExecutorReadServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalExecutorReadServiceImpl.java @@ -1,13 +1,14 @@ package io.v.nutz.zhgh.proposal.services.impl; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalExecutorReadService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.service.impl.ViServiceImpl; + +import io.v.nutz.base.service.impl.ViServiceImpl; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalExecutorReadService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import lombok.extern.slf4j.Slf4j; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalExportServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalExportServiceImpl.java index 3e1dc7e..2de2a1b 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalExportServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalExportServiceImpl.java @@ -8,10 +8,11 @@ import com.deepoove.poi.policy.HackLoopTableRenderPolicy; import io.v.nutz.base.service.impl.BaseServiceImpl; import io.v.nutz.base.utils.Html2Text; import io.v.nutz.base.utils.OfficeTemplateUtil; -import io.v.nutz.proposal.services.ProposalExportService; -import io.v.nutz.proposal.services.ProposalInfoService; + import io.v.nutz.sys.models.Sys_signature; import io.v.nutz.web.commons.base.Globals; +import io.v.nutz.zhgh.proposal.services.ProposalExportService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import lombok.extern.slf4j.Slf4j; import org.ddr.poi.html.HtmlRenderPolicy; import org.nutz.dao.Cnd; @@ -26,7 +27,6 @@ import org.nutz.json.Json; import org.nutz.lang.Lang; import org.nutz.lang.Strings; import org.nutz.lang.util.NutMap; - import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -37,8 +37,6 @@ import java.util.Base64; import java.util.HashMap; import java.util.List; -import static io.v.nutz.util.ViResource.dao; - @IocBean(args = {"refer:dao"}) @Slf4j public class ProposalExportServiceImpl extends BaseServiceImpl implements ProposalExportService { @@ -57,7 +55,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl implements Propos public void exportFull(String proposalId, HttpServletResponse response) throws IOException { Sql sql = Sqls.create("select proposalName,proposalCode from proposal_info where id = @id"); sql.setParam("id", proposalId); - NutMap proposalMap = (NutMap) Daos.query(dao, sql.toString(), Sqls.callback.map()); + NutMap proposalMap = (NutMap) Daos.query(this.dao(), sql.toString(), Sqls.callback.map()); String proposalName = proposalMap.getString("proposalName"); String proposalCode = proposalMap.getString("proposalCode"); @@ -203,7 +201,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl implements Propos } Sql branchCaseSql = Sqls.create("select auditId from proposal_branch_leader_audit where proposalId = @proposalId AND isMaster=true").setParam("proposalId", proposalId); - String[] branchCaseArray = (String[]) Daos.query(dao, branchCaseSql.toString(), Sqls.callback.strs()); + String[] branchCaseArray = (String[]) Daos.query(this.dao(), branchCaseSql.toString(), Sqls.callback.strs()); List replyAuditList = new ArrayList<>(); if (Lang.isNotEmpty(branchCaseArray)) { Sql replyAuditSql = Sqls.create(""" diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalFeedBackServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalFeedBackServiceImpl.java index 8626ff2..106b721 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalFeedBackServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalFeedBackServiceImpl.java @@ -1,9 +1,9 @@ package io.v.nutz.zhgh.proposal.services.impl; -import io.v.nutz.proposal.models.ProposalFeedback; -import io.v.nutz.proposal.models.ProposalUndertake; -import io.v.nutz.proposal.services.ProposalFeedBackService; -import io.v.nutz.service.impl.ViServiceImpl; +import io.v.nutz.base.service.impl.ViServiceImpl; +import io.v.nutz.zhgh.proposal.models.ProposalFeedback; +import io.v.nutz.zhgh.proposal.models.ProposalUndertake; +import io.v.nutz.zhgh.proposal.services.ProposalFeedBackService; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalHandlingProgressServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalHandlingProgressServiceImpl.java index 15da12c..0ce5ea9 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalHandlingProgressServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalHandlingProgressServiceImpl.java @@ -1,13 +1,13 @@ package io.v.nutz.zhgh.proposal.services.impl; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalHandlingProgressService; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.service.impl.ViServiceImpl; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.impl.ViServiceImpl; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalHandlingProgressService; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalImportServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalImportServiceImpl.java index 82458b0..c2febf5 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalImportServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalImportServiceImpl.java @@ -2,19 +2,19 @@ package io.v.nutz.zhgh.proposal.services.impl; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; +import io.v.nutz.base.service.impl.ViServiceImpl; import io.v.nutz.base.utils.DateUtil; -import io.v.nutz.jdh.model.cb.Jdh_jdhxx; -import io.v.nutz.jdh.model.db.Jdh_db; -import io.v.nutz.jdh.model.zzjg.Jdh_jgcy; -import io.v.nutz.proposal.constants.ProposalImportEnum; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalType; -import io.v.nutz.proposal.services.ProposalImportService; -import io.v.nutz.service.impl.ViServiceImpl; import io.v.nutz.sys.models.Sys_dict; import io.v.nutz.sys.models.Sys_user; -import io.v.nutz.util.ShiroUtil; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.jdh.model.cb.Jdh_jdhxx; +import io.v.nutz.zhgh.jdh.model.db.Jdh_db; +import io.v.nutz.zhgh.jdh.model.zzjg.Jdh_jgcy; +import io.v.nutz.zhgh.proposal.constants.ProposalImportEnum; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalType; +import io.v.nutz.zhgh.proposal.services.ProposalImportService; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalInfoServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalInfoServiceImpl.java index 9ddebf5..ea31eaa 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalInfoServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalInfoServiceImpl.java @@ -6,17 +6,17 @@ import cn.wizzer.framework.base.service.BaseService; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.policy.HackLoopTableRenderPolicy; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.impl.ViServiceImpl; import io.v.nutz.base.utils.Html2Text; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.service.impl.ViServiceImpl; import io.v.nutz.sys.models.Sys_signature; -import io.v.nutz.util.ShiroUtil; import io.v.nutz.web.commons.base.Globals; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.models.ProposalState; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; import org.ddr.poi.html.HtmlRenderPolicy; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; @@ -175,11 +175,11 @@ public class ProposalInfoServiceImpl extends ViServiceImpl impleme group.orLike("su.loginname", search.getCreateUser()); cnd.and(group); } - cnd.andExcludeEmpty("info.teacherMeetingId", "=", search.getMeetingId()); - cnd.andExcludeEmpty("info.delegationId", "=", search.getDelegationId()); - cnd.andExcludeEmpty("info.resultCode", "=", search.getResultCode()); - cnd.andExcludeEmpty("su.unionId", "=", search.getUnionId()); - cnd.andExcludeEmpty("su.unitId", "=", search.getUnitId()); + cnd.andEx("info.teacherMeetingId", "=", search.getMeetingId()); + cnd.andEx("info.delegationId", "=", search.getDelegationId()); + cnd.andEx("info.resultCode", "=", search.getResultCode()); + cnd.andEx("su.unionId", "=", search.getUnionId()); + cnd.andEx("su.unitId", "=", search.getUnitId()); if (StrUtil.isNotBlank(page.getPageOrderName())) { String orderBy = page.getPageOrderBy().startsWith("asc") ? "ASC" : "DESC"; @@ -628,9 +628,9 @@ public class ProposalInfoServiceImpl extends ViServiceImpl impleme } @Override - public List getProposalEnableStateCode() { - FieldFilter fieldFilter = FieldFilter.create(io.v.nutz.proposal.models.ProposalState.class, "^stateCode|stateName|isSign$"); - return Daos.ext(dao(), fieldFilter).query(io.v.nutz.proposal.models.ProposalState.class, Cnd.where("isEnable", "=", true)); + public List getProposalEnableStateCode() { + FieldFilter fieldFilter = FieldFilter.create(ProposalState.class, "^stateCode|stateName|isSign$"); + return Daos.ext(dao(), fieldFilter).query(ProposalState.class, Cnd.where("isEnable", "=", true)); } /** @@ -639,8 +639,8 @@ public class ProposalInfoServiceImpl extends ViServiceImpl impleme * @return */ @Override - public List getProposalNeedSignStateCode() { - List proposalEnableStateCode = getProposalEnableStateCode(); + public List getProposalNeedSignStateCode() { + List proposalEnableStateCode = getProposalEnableStateCode(); return proposalEnableStateCode.stream().filter(v -> v.getIsSign() != null && v.getIsSign()).collect(Collectors.toList()); } } diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalLeaderAuditServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalLeaderAuditServiceImpl.java index 9f6b29f..6254235 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalLeaderAuditServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalLeaderAuditServiceImpl.java @@ -1,20 +1,20 @@ package io.v.nutz.zhgh.proposal.services.impl; import cn.wizzer.framework.page.Pagination; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.impl.ViServiceImpl; import io.v.nutz.base.utils.DateUtil; import io.v.nutz.base.utils.Roles; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalReply; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalLeaderAuditService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.service.impl.ViServiceImpl; import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalReply; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalLeaderAuditService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalPrincipalReadServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalPrincipalReadServiceImpl.java index de72f1f..205b0ac 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalPrincipalReadServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalPrincipalReadServiceImpl.java @@ -1,14 +1,15 @@ package io.v.nutz.zhgh.proposal.services.impl; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalPrincipalReadService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.service.impl.ViServiceImpl; + +import io.v.nutz.base.service.impl.ViServiceImpl; import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalPrincipalReadService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalProgressServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalProgressServiceImpl.java index 703cc99..c9037e9 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalProgressServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalProgressServiceImpl.java @@ -1,9 +1,9 @@ package io.v.nutz.zhgh.proposal.services.impl; import cn.hutool.core.util.StrUtil; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.services.ProposalProgressService; -import io.v.nutz.service.impl.ViServiceImpl; +import io.v.nutz.base.service.impl.ViServiceImpl; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.services.ProposalProgressService; import org.nutz.dao.Dao; import org.nutz.ioc.loader.annotation.IocBean; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalProposalPreAuditServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalProposalPreAuditServiceImpl.java index f3a8728..32e2a76 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalProposalPreAuditServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalProposalPreAuditServiceImpl.java @@ -2,17 +2,17 @@ package io.v.nutz.zhgh.proposal.services.impl; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.page.Pagination; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.ProposalAudit; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalSearch; -import io.v.nutz.proposal.models.ProposalSeconded; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalPreAuditService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.service.impl.ViServiceImpl; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.impl.ViServiceImpl; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.ProposalAudit; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalSearch; +import io.v.nutz.zhgh.proposal.models.ProposalSeconded; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalPreAuditService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalReplyServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalReplyServiceImpl.java index 6247191..c97da0d 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalReplyServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalReplyServiceImpl.java @@ -3,23 +3,23 @@ package io.v.nutz.zhgh.proposal.services.impl; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; import cn.wizzer.framework.page.Pagination; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.impl.ViServiceImpl; import io.v.nutz.base.utils.DateUtil; import io.v.nutz.base.utils.Roles; -import io.v.nutz.dao.CndPlus; -import io.v.nutz.modules.models.PageForm; -import io.v.nutz.proposal.constants.ProposalConstant; -import io.v.nutz.proposal.constants.ProposalState; -import io.v.nutz.proposal.constants.ProposalStateDirectionEnum; -import io.v.nutz.proposal.models.*; -import io.v.nutz.proposal.services.ProposalCommonService; -import io.v.nutz.proposal.services.ProposalProcessService; -import io.v.nutz.proposal.services.ProposalReplyService; -import io.v.nutz.service.impl.ViServiceImpl; import io.v.nutz.sys.models.Sys_signature; import io.v.nutz.sys.models.Sys_user_role; import io.v.nutz.sys.services.SysRoleService; import io.v.nutz.sys.services.SysUserService; -import io.v.nutz.util.ShiroUtil; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.constants.ProposalConstant; +import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalStateDirectionEnum; +import io.v.nutz.zhgh.proposal.models.*; +import io.v.nutz.zhgh.proposal.services.ProposalCommonService; +import io.v.nutz.zhgh.proposal.services.ProposalProcessService; +import io.v.nutz.zhgh.proposal.services.ProposalReplyService; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; @@ -306,7 +306,7 @@ public class ProposalReplyServiceImpl extends ViServiceImpl imple } else { cnd.and("pr.underTakeType", "in", new Object[]{1}); } - cnd.andExcludeEmpty("pr.proposalId", "=", proposalId); + cnd.andEx("pr.proposalId", "=", proposalId); cnd.desc("pr.replyTime"); sql.setCondition(cnd); return listMap(sql); diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalSecondedServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalSecondedServiceImpl.java index 8124ec3..436fd97 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalSecondedServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalSecondedServiceImpl.java @@ -1,9 +1,10 @@ package io.v.nutz.zhgh.proposal.services.impl; +import io.v.nutz.base.service.impl.ViServiceImpl; import io.v.nutz.base.utils.Roles; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalSeconded; -import io.v.nutz.service.impl.ViServiceImpl; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalSeconded; +import io.v.nutz.zhgh.proposal.services.ProposalSecondedService; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; import org.nutz.dao.entity.Record; @@ -21,7 +22,7 @@ import java.util.stream.Collectors; * @createTime 2022年02月17日 16:06:00 */ @IocBean(args = {"refer:dao"}) -public class ProposalSecondedServiceImpl extends ViServiceImpl implements io.v.nutz.proposal.services.ProposalSecondedService { +public class ProposalSecondedServiceImpl extends ViServiceImpl implements ProposalSecondedService { /* @Inject private MsgApi msgApi;*/ diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalUrgeServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalUrgeServiceImpl.java index dcd46cb..bbd0596 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalUrgeServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalUrgeServiceImpl.java @@ -1,16 +1,18 @@ package io.v.nutz.zhgh.proposal.services.impl; import cn.wizzer.framework.base.Result; +import io.v.nutz.base.service.impl.ViServiceImpl; import io.v.nutz.base.utils.DateUtil; import io.v.nutz.base.utils.RCSCloudAPI; import io.v.nutz.base.utils.Roles; -import io.v.nutz.proposal.models.ProposalInfo; -import io.v.nutz.proposal.models.ProposalUrge; -import io.v.nutz.proposal.services.ProposalInfoService; -import io.v.nutz.proposal.services.ProposalUrgeService; -import io.v.nutz.service.impl.ViServiceImpl; + import io.v.nutz.sys.services.SysUserService; -import io.v.nutz.util.ShiroUtil; + +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.proposal.models.ProposalInfo; +import io.v.nutz.zhgh.proposal.models.ProposalUrge; +import io.v.nutz.zhgh.proposal.services.ProposalInfoService; +import io.v.nutz.zhgh.proposal.services.ProposalUrgeService; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/wechat/WechatController.java b/src/main/java/io/v/nutz/zhgh/proposal/wechat/WechatController.java index 7e1790d..b4dc7c6 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/wechat/WechatController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/wechat/WechatController.java @@ -1,9 +1,9 @@ package io.v.nutz.zhgh.proposal.wechat; import io.v.nutz.base.utils.Roles; -import io.v.nutz.proposal.models.ProposalUndertake; import io.v.nutz.sys.services.SysUserService; import io.v.nutz.web.commons.slog.SLogService; +import io.v.nutz.zhgh.proposal.models.ProposalUndertake; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java index 153f191..784bb83 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java @@ -120,7 +120,6 @@ public class MemberChangeManageController { SELECT u.*, his.id hisId, - his.changeType, his.changeTypes, his.changeTime, IF( his.id IS NULL, FALSE, TRUE ) hasHis, @@ -178,7 +177,7 @@ public class MemberChangeManageController { } if (Strings.isNotBlank(pageForm.getPageOrderName()) && Strings.isNotBlank(pageForm.getPageOrderBy())) { - cnd.orderBy((List.of("changeTime", "changeType", "changeTypes").contains(pageForm.getPageOrderName()) ? "his." : "u.") + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); + cnd.orderBy((List.of("changeTime", "changeTypes").contains(pageForm.getPageOrderName()) ? "his." : "u.") + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); } else { cnd.desc("his.changeTime"); }