ZongYue / ChinaPortEnergy

Download as
Browse Code »

Commit 46f5306438369553660c1f3361201a721a13a204

Authored by 陈威
1 parent 8ea9c133
Exists in master

添加中国港能模块

Showing 14 changed files with 953 additions and 20 deletions   Show diff stats
backend/assembly/pom.xml
  Diff comments   View file @46f5306
... ... @@ -52,6 +52,12 @@
52 52 <artifactId>portal</artifactId>
53 53 <version>${parent.version}</version>
54 54 </dependency>
  55 +
  56 + <dependency>
  57 + <groupId>com.hotent</groupId>
  58 + <artifactId>chkpower</artifactId>
  59 + <version>${parent.version}</version>
  60 + </dependency>
55 61 <dependency>
56 62 <groupId>com.hotent</groupId>
57 63 <artifactId>form</artifactId>
... ...
backend/assembly/src/main/resources/application-dev.yml
  Diff comments   View file @46f5306
... ... @@ -42,7 +42,7 @@ spring:
42 42  
43 43  
44 44 server:
45   - port: 8088
  45 + port: 6799
46 46  
47 47 # 1. redis.enable=false 时无论redis.caffeine.enabled配置为true还是false均使用caffeine作为缓存
48 48 # 2. redis.enable=true 且 redis.caffeine.enabled=false 仅仅使用redis作为缓存
... ...
backend/bpm-runtime/src/main/java/com/hotent/runtime/script/ScriptImpl.java
  Diff comments   View file @46f5306
... ... @@ -5,15 +5,8 @@ import java.text.ParseException;
5 5 import java.time.LocalDateTime;
6 6 import java.time.ZoneOffset;
7 7 import java.time.format.DateTimeFormatter;
8   -import java.util.Arrays;
9   -import java.util.HashMap;
10   -import java.util.HashSet;
11   -import java.util.Iterator;
12   -import java.util.LinkedHashSet;
13   -import java.util.List;
14   -import java.util.Map;
  8 +import java.util.*;
15 9 import java.util.Map.Entry;
16   -import java.util.Set;
17 10 import java.util.concurrent.CompletableFuture;
18 11 import java.util.concurrent.ExecutorService;
19 12 import java.util.concurrent.Executors;
... ... @@ -21,9 +14,12 @@ import java.util.concurrent.TimeUnit;
21 14  
22 15 import javax.annotation.Resource;
23 16  
  17 +import cn.hutool.core.util.ObjectUtil;
24 18 import com.fasterxml.jackson.databind.node.*;
25 19 import com.hotent.base.datasource.DatabaseContext;
26 20 import com.hotent.base.manager.CommonManager;
  21 +import com.hotent.base.util.*;
  22 +import com.hotent.base.util.Base64;
27 23 import com.hotent.runtime.utils.SubCalcUtils;
28 24 import org.apache.commons.lang.exception.ExceptionUtils;
29 25 import org.springframework.context.annotation.Primary;
... ... @@ -42,13 +38,6 @@ import com.hotent.base.feign.PortalFeignService;
42 38 import com.hotent.base.feign.UCFeignService;
43 39 import com.hotent.base.groovy.IScript;
44 40 import com.hotent.base.model.CommonResult;
45   -import com.hotent.base.util.AppUtil;
46   -import com.hotent.base.util.Base64;
47   -import com.hotent.base.util.BeanUtils;
48   -import com.hotent.base.util.EncryptUtil;
49   -import com.hotent.base.util.FluentUtil;
50   -import com.hotent.base.util.JsonUtil;
51   -import com.hotent.base.util.StringUtil;
52 41 import com.hotent.base.util.time.DateFormatUtil;
53 42 import com.hotent.base.util.time.DateUtil;
54 43 import com.hotent.base.util.time.TimeUtil;
... ... @@ -1783,5 +1772,96 @@ public class ScriptImpl implements IScript {
1783 1772 return SubCalcUtils.subFieldNotContain(subArray, field, op, value, dateType);
1784 1773 }
1785 1774  
  1775 + //当前登陆用户的ID
  1776 + private static final String LOGIN_USER = "loginUser";
  1777 + //当前登陆用户所属组织的ID
  1778 + private static final String LOGIN_USER_ORGS = "loginUserOrgs";
  1779 + //当前登陆用户所属组织及下属组织的ID
  1780 + private static final String LOGIN_USER_SUB_ORGS = "loginUserSubOrgs";
  1781 + //当前登陆用户所属组织及所有下属组织的ID
  1782 + private static final String LOGIN_USER_ALL_SUB_ORGS = "loginUserAllSubOrgs";
  1783 + //当前登录用户所在组织 所有上下 组织id
  1784 + private static final String LOGIN_USER_ALL_ORGS = "loginUserAllOrgs";
  1785 + public ArrayList<String> getDataPermission(String type) {
  1786 + ArrayList<String> orgIds = new ArrayList<String>();
  1787 + IUser currentUser = ContextUtil.getCurrentUser();
  1788 + if (BeanUtils.isNotEmpty(type)) {
  1789 + if (LOGIN_USER.equals(type)) {
  1790 + orgIds.add(currentUser.getUserId());
  1791 + } else if (LOGIN_USER_ORGS.equals(type)) {
  1792 + String currentUserOrgIds = currentUser.getAttrbuite("CURRENT_USER_ORGIDS");
  1793 + if (StringUtil.isNotEmpty(currentUserOrgIds)) {
  1794 + String[] oids = currentUserOrgIds.split(",");
  1795 + Set<String> oidSet = new HashSet<String>(Arrays.asList(oids));
  1796 + orgIds.addAll(oidSet);
  1797 + }
  1798 + } else if (LOGIN_USER_SUB_ORGS.equals(type)) {
  1799 + String currentUserSubOrgIds = StringUtil.isNotEmpty(AuthenticationUtil.getCurrentUserSubOrgIds()) ? AuthenticationUtil.getCurrentUserSubOrgIds() : "";
  1800 + String currentUserOrgIds = StringUtil.isNotEmpty(AuthenticationUtil.getCurrentUserOrgIds()) ? AuthenticationUtil.getCurrentUserOrgIds() : "";
  1801 + currentUserSubOrgIds += "," + currentUserOrgIds;
  1802 + String[] oids = new String[]{};
  1803 + if (StringUtil.isNotEmpty(currentUserSubOrgIds)) {
  1804 + oids = currentUserSubOrgIds.split(",");
  1805 + }
  1806 + if (oids.length == 0) {
  1807 + oids = new String[]{"-1"};
  1808 + }
  1809 + Set<String> oidSet = new HashSet<String>(Arrays.asList(oids));
  1810 + orgIds.addAll(oidSet);
  1811 + } else if (LOGIN_USER_ALL_SUB_ORGS.equals(type)) {
  1812 + String currentUserSubOrgIds = StringUtil.isNotEmpty(AuthenticationUtil.getCurrentUserSubOrgIds()) ? AuthenticationUtil.getCurrentUserSubOrgIds() : "";
  1813 + String currentUserOrgIds = StringUtil.isNotEmpty(AuthenticationUtil.getCurrentUserOrgIds()) ? AuthenticationUtil.getCurrentUserOrgIds() : "";
  1814 + currentUserSubOrgIds += "," + currentUserOrgIds;
  1815 + String[] oids = new String[]{};
  1816 + if (StringUtil.isNotEmpty(currentUserSubOrgIds)) {
  1817 + oids = currentUserSubOrgIds.split(",");
  1818 + }
  1819 + if (oids.length == 0) {
  1820 + oids = new String[]{"-1"};
  1821 + }
  1822 + Set<String> oidSet = new HashSet<>(Arrays.asList(oids));
  1823 + orgIds.addAll(oidSet);
  1824 + } else if (LOGIN_USER_ALL_ORGS.equals(type)) {
  1825 + ArrayNode department = uCFeignService.getOrgListByUserId(getCurrentUserId());
  1826 + for (JsonNode node : department) {
  1827 + //所有上级组织
  1828 + ObjectNode dept = (ObjectNode) node;
  1829 + String id = dept.get("id").asText();
  1830 + String path = dept.get("path").asText();
  1831 + String[] pathlist = path.split("\\.");
  1832 + Set<String> oidSet1 = new HashSet<>(Arrays.asList(pathlist));
  1833 + orgIds.addAll(oidSet1);
  1834 + //所有下级组织
  1835 +// String currentUserSubOrgIds = StringUtil.isNotEmpty(AuthenticationUtil.getCurrentUserSubOrgIds()) ? AuthenticationUtil.getCurrentUserSubOrgIds() : "";
  1836 +// String currentUserOrgIds = StringUtil.isNotEmpty(AuthenticationUtil.getCurrentUserOrgIds()) ? AuthenticationUtil.getCurrentUserOrgIds() : "";
  1837 +// currentUserSubOrgIds += "," + currentUserOrgIds;
  1838 +// String[] oids = new String[]{};
  1839 +// if (StringUtil.isNotEmpty(currentUserSubOrgIds)) {
  1840 +// oids = currentUserSubOrgIds.split(",");
  1841 +// }
  1842 +// if (oids.length == 0) {
  1843 +// oids = new String[]{"-1"};
  1844 +// }
  1845 +// Set<String> oidSet = new HashSet<>(Arrays.asList(oids));
  1846 + Set<String> oidSet = new HashSet<>();
  1847 + List<ObjectNode> orgsByparentId = uCFeignService.getChildOrg(id);//从数据库取下属组织数据，解决缓存中的组织不全问题
  1848 + if (ObjectUtil.isNotEmpty(orgsByparentId)) {
  1849 + for (ObjectNode jsonNodes : orgsByparentId) {
  1850 + oidSet.add(jsonNodes.get("id").asText());
  1851 + }
  1852 + }
  1853 + String currentUserOrgIds = StringUtil.isNotEmpty(AuthenticationUtil.getCurrentUserOrgIds()) ? AuthenticationUtil.getCurrentUserOrgIds() : "";
  1854 + if (ObjectUtil.isNotEmpty(currentUserOrgIds)) {
  1855 + oidSet.add(currentUserOrgIds);
  1856 + }
  1857 + orgIds.addAll(oidSet);
  1858 +
  1859 + }
  1860 + }
  1861 +
  1862 + }
  1863 + return orgIds;
  1864 + }
  1865 +
1786 1866  
1787 1867 }
... ...
backend/chkpower/pom.xml 0 → 100644
  Diff comments   View file @46f5306
... ... @@ -0,0 +1,117 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <parent>
  6 + <artifactId>eip</artifactId>
  7 + <groupId>com.hotent</groupId>
  8 + <version>8.2.1-peony</version>
  9 + </parent>
  10 + <modelVersion>4.0.0</modelVersion>
  11 +
  12 + <artifactId>chkpower</artifactId>
  13 + <name>chkpower</name>
  14 + <description>chkpower</description>
  15 +
  16 + <dependencies>
  17 + <dependency>
  18 + <groupId>org.springframework</groupId>
  19 + <artifactId>spring-web</artifactId>
  20 + </dependency>
  21 +
  22 + <dependency>
  23 + <groupId>org.projectlombok</groupId>
  24 + <artifactId>lombok</artifactId>
  25 + <version>1.18.20</version>
  26 + </dependency>
  27 +
  28 + <dependency>
  29 + <groupId>com.hotent</groupId>
  30 + <artifactId>bpm-runtime</artifactId>
  31 + <version>8.2.1-peony</version>
  32 + <scope>compile</scope>
  33 + </dependency>
  34 +
  35 + <dependency>
  36 + <groupId>com.hotent</groupId>
  37 + <artifactId>base</artifactId>
  38 + <version>8.2.1-peony</version>
  39 + <scope>compile</scope>
  40 + </dependency>
  41 +
  42 + <dependency>
  43 + <groupId>junit</groupId>
  44 + <artifactId>junit</artifactId>
  45 + <version>4.13.2</version>
  46 + <scope>test</scope>
  47 + </dependency>
  48 + <dependency>
  49 + <groupId>com.baomidou</groupId>
  50 + <artifactId>mybatis-plus-annotation</artifactId>
  51 + <version>3.4.2</version>
  52 + </dependency>
  53 +
  54 + <dependency>
  55 + <groupId>cn.hutool</groupId>
  56 + <artifactId>hutool-all</artifactId>
  57 + </dependency>
  58 + <dependency>
  59 + <groupId>com.hotent</groupId>
  60 + <artifactId>uc</artifactId>
  61 + <version>8.2.1-peony</version>
  62 + </dependency>
  63 + <dependency>
  64 + <groupId>com.hotent</groupId>
  65 + <artifactId>bo</artifactId>
  66 + <version>8.2.1-peony</version>
  67 + </dependency>
  68 +
  69 +
  70 + <dependency>
  71 + <groupId>com.alibaba</groupId>
  72 + <artifactId>fastjson</artifactId>
  73 + <version>1.2.39</version>
  74 + </dependency>
  75 +
  76 + <dependency>
  77 + <groupId>com.tencentcloudapi</groupId>
  78 + <artifactId>tencentcloud-sdk-java</artifactId>
  79 + <version>3.1.328</version>
  80 + </dependency>
  81 + <dependency>
  82 + <groupId>com.aliyun</groupId>
  83 + <artifactId>aliyun-java-sdk-core</artifactId>
  84 + <version>4.4.6</version>
  85 + <scope>compile</scope>
  86 + </dependency>
  87 + <dependency>
  88 + <groupId>com.aliyun</groupId>
  89 + <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
  90 + <version>1.1.0</version>
  91 + <scope>compile</scope>
  92 + </dependency>
  93 +
  94 +
  95 + <!-- <dependency>-->
  96 + <!-- <groupId>com.hotent</groupId>-->
  97 + <!-- <artifactId>base</artifactId>-->
  98 + <!-- <version>${parent.version}</version>-->
  99 + <!-- <scope>compile</scope>-->
  100 + <!-- </dependency>-->
  101 + </dependencies>
  102 +
  103 +
  104 + <build>
  105 + <plugins>
  106 + <plugin>
  107 + <groupId>org.apache.maven.plugins</groupId>
  108 + <artifactId>maven-resources-plugin</artifactId>
  109 + <configuration>
  110 + <nonFilteredFileExtensions>
  111 + <nonFilteredFileExtension>xls</nonFilteredFileExtension>
  112 + </nonFilteredFileExtensions>
  113 + </configuration>
  114 + </plugin>
  115 + </plugins>
  116 + </build>
  117 +</project>
... ...
backend/chkpower/src/main/java/com/hotent/chkpower/controller/WCurrentController.java 0 → 100644
  Diff comments   View file @46f5306
... ... @@ -0,0 +1,66 @@
  1 +package com.hotent.chkpower.controller;
  2 +
  3 +
  4 +import org.springframework.web.bind.annotation.GetMapping;
  5 +import org.springframework.web.bind.annotation.PostMapping;
  6 +import org.springframework.web.bind.annotation.RequestBody;
  7 +import org.springframework.web.bind.annotation.RequestMapping;
  8 +import org.springframework.web.bind.annotation.RequestParam;
  9 +import com.hotent.base.model.CommonResult;
  10 +import com.hotent.base.util.StringUtil;
  11 +import io.swagger.annotations.ApiOperation;
  12 +import io.swagger.annotations.ApiParam;
  13 +import org.springframework.web.bind.annotation.RestController;
  14 +import com.hotent.base.controller.BaseController;
  15 +import com.hotent.chkpower.model.WCurrent;
  16 +import com.hotent.chkpower.manager.WCurrentManager;
  17 +
  18 +import java.util.List;
  19 +
  20 +/**
  21 + * 活期账户 前端控制器
  22 + *
  23 + * @company 广州宏天软件股份有限公司
  24 + * @author cw
  25 + * @since 2024-07-05
  26 + */
  27 +@RestController
  28 +@RequestMapping("/wCurrent/v1/")
  29 +public class WCurrentController extends BaseController<WCurrentManager, WCurrent> {
  30 +
  31 + /**
  32 + * 根据id获取活期账户数据详情
  33 + * @param id
  34 + * @return
  35 + * @throws Exception
  36 + * ModelAndView
  37 + */
  38 + @GetMapping(value="/getDetail")
  39 + @ApiOperation(value="根据id获取活期账户数据详情",httpMethod = "GET",notes = "根据id获取活期账户数据详情")
  40 + public CommonResult<WCurrent> getDetail(@ApiParam(name="id",value="业务对象主键", required = true)@RequestParam(required=true) String id) throws Exception{
  41 + return CommonResult.<WCurrent>ok().value(baseService.getDetail(id));
  42 + }
  43 + /**
  44 + * 新增,更新活期账户
  45 + * @param wCurrent
  46 + * @throws Exception
  47 + * @return
  48 + * @exception
  49 + */
  50 + @PostMapping(value="/save")
  51 + @ApiOperation(value = "新增,更新活期账户数据", httpMethod = "POST", notes = "新增,更新活期账户数据")
  52 + public CommonResult<String> save(@ApiParam(name="WCurrent",value="活期账户对象", required = true)@RequestBody WCurrent wCurrent) throws Exception{
  53 + String msg = StringUtil.isEmpty(wCurrent.getId()) ? "添加活期账户成功" : "更新活期账户成功";
  54 + baseService.createOrUpdate(wCurrent);
  55 + return CommonResult.<String>ok().message(msg);
  56 + }
  57 +
  58 + @GetMapping(value="/getHistoricalDetail")
  59 + public CommonResult getHistoricalDetail() throws Exception{
  60 + List<WCurrent> data = baseService.getHistoricalDetail();
  61 + return new CommonResult(true, "成功", data);
  62 + }
  63 +
  64 +
  65 +
  66 +}
... ...
backend/chkpower/src/main/java/com/hotent/chkpower/dao/WCurrentDao.java 0 → 100644
  Diff comments   View file @46f5306
... ... @@ -0,0 +1,23 @@
  1 +package com.hotent.chkpower.dao;
  2 +
  3 +import com.hotent.chkpower.model.WCurrent;
  4 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  5 +import org.apache.ibatis.annotations.Param;
  6 +
  7 +import java.util.ArrayList;
  8 +import java.util.List;
  9 +
  10 +/**
  11 + * 活期账户 Mapper 接口
  12 + *
  13 + * @company 广州宏天软件股份有限公司
  14 + * @author cw
  15 + * @since 2024-07-05
  16 + */
  17 +public interface WCurrentDao extends BaseMapper<WCurrent> {
  18 +
  19 + List<WCurrent> getHistoricalDetail( @Param("orgIdList") ArrayList<String> orgIdList);
  20 +
  21 +
  22 +
  23 +}
... ...
backend/chkpower/src/main/java/com/hotent/chkpower/manager/WCurrentManager.java 0 → 100644
  Diff comments   View file @46f5306
... ... @@ -0,0 +1,33 @@
  1 +package com.hotent.chkpower.manager;
  2 +
  3 +import com.hotent.chkpower.model.WCurrent;
  4 +import com.hotent.base.manager.BaseManager;
  5 +
  6 +import java.util.List;
  7 +
  8 +/**
  9 + * 活期账户 服务类
  10 + *
  11 + * @company 广州宏天软件股份有限公司
  12 + * @author cw
  13 + * @since 2024-07-05
  14 + */
  15 +public interface WCurrentManager extends BaseManager<WCurrent> {
  16 + /**
  17 + * 根据主键获取详情
  18 + * @param id
  19 + * @return
  20 + */
  21 + WCurrent getDetail(String id);
  22 + /**
  23 + * 新建、更新活期账户
  24 + * @param wCurrent
  25 + * @return
  26 + */
  27 + void createOrUpdate(WCurrent wCurrent);
  28 +
  29 + List<WCurrent> getHistoricalDetail();
  30 +
  31 +
  32 +
  33 +}
... ...
backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentManagerImpl.java 0 → 100644
  Diff comments   View file @46f5306
... ... @@ -0,0 +1,50 @@
  1 +package com.hotent.chkpower.manager.impl;
  2 +
  3 +import com.hotent.chkpower.model.WCurrent;
  4 +import com.hotent.chkpower.dao.WCurrentDao;
  5 +import com.hotent.chkpower.manager.WCurrentManager;
  6 +import com.hotent.base.manager.impl.BaseManagerImpl;
  7 +import com.hotent.runtime.script.ScriptImpl;
  8 +import org.springframework.stereotype.Service;
  9 +import org.springframework.transaction.annotation.Transactional;
  10 +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  11 +
  12 +import java.util.ArrayList;
  13 +import java.util.Collections;
  14 +import java.util.List;
  15 +import javax.annotation.Resource;
  16 +import com.hotent.base.util.BeanUtils;
  17 +
  18 +
  19 +/**
  20 + * 活期账户 服务实现类
  21 + *
  22 + * @company 广州宏天软件股份有限公司
  23 + * @author cw
  24 + * @since 2024-07-05
  25 + */
  26 +@Service
  27 +public class WCurrentManagerImpl extends BaseManagerImpl<WCurrentDao, WCurrent> implements WCurrentManager {
  28 + @Resource
  29 + private ScriptImpl script;
  30 +
  31 + @Override
  32 + public WCurrent getDetail(String id) {
  33 + WCurrent wCurrent = this.get(id);
  34 + return wCurrent;
  35 + }
  36 + @Override
  37 + @Transactional
  38 + public void createOrUpdate(WCurrent wCurrent) {
  39 + //新建或更新
  40 + this.saveOrUpdate(wCurrent);
  41 + }
  42 +
  43 + @Override
  44 + public List<WCurrent> getHistoricalDetail() {
  45 + ArrayList<String> orgIdList = script.getDataPermission("loginUserAllSubOrgs");
  46 + List<WCurrent> data= baseMapper.getHistoricalDetail(orgIdList);
  47 +
  48 + return data;
  49 + }
  50 +}
... ...
backend/chkpower/src/main/java/com/hotent/chkpower/model/WCurrent.java 0 → 100644
  Diff comments   View file @46f5306
... ... @@ -0,0 +1,454 @@
  1 +package com.hotent.chkpower.model;
  2 +
  3 +import java.math.BigDecimal;
  4 +import com.baomidou.mybatisplus.annotation.IdType;
  5 +import com.hotent.base.entity.BaseModel;
  6 +import com.baomidou.mybatisplus.extension.activerecord.Model;
  7 +import com.baomidou.mybatisplus.annotation.TableId;
  8 +import java.time.LocalDateTime;
  9 +import com.baomidou.mybatisplus.annotation.TableField;
  10 +import java.io.Serializable;
  11 +import io.swagger.annotations.ApiModel;
  12 +import io.swagger.annotations.ApiModelProperty;
  13 +import com.fasterxml.jackson.annotation.JsonProperty;
  14 +/**
  15 + * 活期账户
  16 + *
  17 + * @company 广州宏天软件股份有限公司
  18 + * @author cw
  19 + * @since 2024-07-05
  20 + */
  21 +@ApiModel(value="WCurrent对象", description="活期账户")
  22 +public class WCurrent extends BaseModel<WCurrent> {
  23 +
  24 + private static final long serialVersionUID = 1L;
  25 + @ApiModelProperty(value = "主键")
  26 + @TableId(value = "ID_", type = IdType.ASSIGN_ID)
  27 + @JsonProperty("id")
  28 + private String id;
  29 +
  30 + @ApiModelProperty(value = "外键")
  31 + @TableField("REF_ID_")
  32 + @JsonProperty("refId")
  33 + private String refId;
  34 +
  35 + @ApiModelProperty(value = "账户余额")
  36 + @TableField("F_account_balance")
  37 + @JsonProperty("fAccountBalance")
  38 + private BigDecimal fAccountBalance;
  39 +
  40 + @ApiModelProperty(value = "账户可用余额")
  41 + @TableField("F_available_balance")
  42 + @JsonProperty("fAvailableBalance")
  43 + private BigDecimal fAvailableBalance;
  44 +
  45 + @ApiModelProperty(value = "被冻结金额")
  46 + @TableField("F_freeze_amount")
  47 + @JsonProperty("fFreezeAmount")
  48 + private BigDecimal fFreezeAmount;
  49 +
  50 + @ApiModelProperty(value = "冻结上限")
  51 + @TableField("F_freezing")
  52 + @JsonProperty("fFreezing")
  53 + private BigDecimal fFreezing;
  54 +
  55 + @ApiModelProperty(value = "备注")
  56 + @TableField("F_notes")
  57 + @JsonProperty("fNotes")
  58 + private String fNotes;
  59 +
  60 + @ApiModelProperty(value = "创建时间")
  61 + @TableField("F_create_time")
  62 + @JsonProperty("fCreateTime")
  63 + private LocalDateTime fCreateTime;
  64 +
  65 + @ApiModelProperty(value = "创建人")
  66 + @TableField("F_create_by")
  67 + @JsonProperty("fCreateBy")
  68 + private String fCreateBy;
  69 +
  70 + @ApiModelProperty(value = "创建人id")
  71 + @TableField("F_create_id")
  72 + @JsonProperty("fCreateId")
  73 + private String fCreateId;
  74 +
  75 + @ApiModelProperty(value = "公司状态")
  76 + @TableField("F_corp_ope_status")
  77 + @JsonProperty("fCorpOpeStatus")
  78 + private String fCorpOpeStatus;
  79 +
  80 + @ApiModelProperty(value = "负责出纳")
  81 + @TableField("F_treasurer")
  82 + @JsonProperty("fTreasurer")
  83 + private String fTreasurer;
  84 +
  85 + @ApiModelProperty(value = "账户名称")
  86 + @TableField("F_account_name")
  87 + @JsonProperty("fAccountName")
  88 + private String fAccountName;
  89 +
  90 + @ApiModelProperty(value = "开户机构")
  91 + @TableField("F_account_bank_name")
  92 + @JsonProperty("fAccountBankName")
  93 + private String fAccountBankName;
  94 +
  95 + @ApiModelProperty(value = "账号")
  96 + @TableField("F_bank_account")
  97 + @JsonProperty("fBankAccount")
  98 + private String fBankAccount;
  99 +
  100 + @ApiModelProperty(value = "账户性质")
  101 + @TableField("F_account_nature")
  102 + @JsonProperty("fAccountNature")
  103 + private String fAccountNature;
  104 +
  105 + @ApiModelProperty(value = "账户币种")
  106 + @TableField("F_currency")
  107 + @JsonProperty("fCurrency")
  108 + private String fCurrency;
  109 +
  110 + @ApiModelProperty(value = "账户使用状态")
  111 + @TableField("F_use_status")
  112 + @JsonProperty("fUseStatus")
  113 + private String fUseStatus;
  114 +
  115 + @ApiModelProperty(value = "表单数据版本")
  116 + @TableField("F_form_data_rev_")
  117 + @JsonProperty("fFormDataRev")
  118 + private Long fFormDataRev;
  119 +
  120 + @ApiModelProperty(value = "公司名称")
  121 + @TableField("F_org_name")
  122 + @JsonProperty("fOrgName")
  123 + private String fOrgName;
  124 +
  125 + @ApiModelProperty(value = "公司id")
  126 + @TableField("F_org_id")
  127 + @JsonProperty("fOrgId")
  128 + private String fOrgId;
  129 +
  130 + @ApiModelProperty(value = "日期")
  131 + @TableField("F_date")
  132 + @JsonProperty("fDate")
  133 + private LocalDateTime fDate;
  134 +
  135 + @ApiModelProperty(value = "核对时间")
  136 + @TableField("F_insp_time")
  137 + @JsonProperty("fInspTime")
  138 + private LocalDateTime fInspTime;
  139 +
  140 + @ApiModelProperty(value = "核对说明备注")
  141 + @TableField("F_insp_notes")
  142 + @JsonProperty("fInspNotes")
  143 + private String fInspNotes;
  144 +
  145 + @ApiModelProperty(value = "核对人")
  146 + @TableField("F_insp_by")
  147 + @JsonProperty("fInspBy")
  148 + private String fInspBy;
  149 +
  150 + @ApiModelProperty(value = "核对人ID")
  151 + @TableField("F_insp_by_id")
  152 + @JsonProperty("fInspById")
  153 + private String fInspById;
  154 +
  155 + @ApiModelProperty(value = "修改人")
  156 + @TableField("F_update_by")
  157 + @JsonProperty("fUpdateBy")
  158 + private String fUpdateBy;
  159 +
  160 + @ApiModelProperty(value = "修改人id")
  161 + @TableField("F_update_id")
  162 + @JsonProperty("fUpdateId")
  163 + private String fUpdateId;
  164 +
  165 + @ApiModelProperty(value = "修改时间")
  166 + @TableField("F_update_time")
  167 + @JsonProperty("fUpdateTime")
  168 + private LocalDateTime fUpdateTime;
  169 +
  170 + @ApiModelProperty(value = "核对状态")
  171 + @TableField("F_insp_status_name")
  172 + @JsonProperty("fInspStatusName")
  173 + private String fInspStatusName;
  174 +
  175 + @ApiModelProperty(value = "核对人ID")
  176 + @TableField("F_insp_id")
  177 + @JsonProperty("fInspId")
  178 + private String fInspId;
  179 +
  180 + @ApiModelProperty(value = "公司类型")
  181 + @TableField("F_org_type")
  182 + @JsonProperty("fOrgType")
  183 + private String fOrgType;
  184 +
  185 +
  186 + public String getId() {
  187 + return id;
  188 + }
  189 +
  190 + public void setId(String id) {
  191 + this.id = id;
  192 + }
  193 + public String getRefId() {
  194 + return refId;
  195 + }
  196 +
  197 + public void setRefId(String refId) {
  198 + this.refId = refId;
  199 + }
  200 + public BigDecimal getFAccountBalance() {
  201 + return fAccountBalance;
  202 + }
  203 +
  204 + public void setFAccountBalance(BigDecimal fAccountBalance) {
  205 + this.fAccountBalance = fAccountBalance;
  206 + }
  207 + public BigDecimal getFAvailableBalance() {
  208 + return fAvailableBalance;
  209 + }
  210 +
  211 + public void setFAvailableBalance(BigDecimal fAvailableBalance) {
  212 + this.fAvailableBalance = fAvailableBalance;
  213 + }
  214 + public BigDecimal getFFreezeAmount() {
  215 + return fFreezeAmount;
  216 + }
  217 +
  218 + public void setFFreezeAmount(BigDecimal fFreezeAmount) {
  219 + this.fFreezeAmount = fFreezeAmount;
  220 + }
  221 + public BigDecimal getFFreezing() {
  222 + return fFreezing;
  223 + }
  224 +
  225 + public void setFFreezing(BigDecimal fFreezing) {
  226 + this.fFreezing = fFreezing;
  227 + }
  228 + public String getFNotes() {
  229 + return fNotes;
  230 + }
  231 +
  232 + public void setFNotes(String fNotes) {
  233 + this.fNotes = fNotes;
  234 + }
  235 + public LocalDateTime getFCreateTime() {
  236 + return fCreateTime;
  237 + }
  238 +
  239 + public void setFCreateTime(LocalDateTime fCreateTime) {
  240 + this.fCreateTime = fCreateTime;
  241 + }
  242 + public String getFCreateBy() {
  243 + return fCreateBy;
  244 + }
  245 +
  246 + public void setFCreateBy(String fCreateBy) {
  247 + this.fCreateBy = fCreateBy;
  248 + }
  249 + public String getFCreateId() {
  250 + return fCreateId;
  251 + }
  252 +
  253 + public void setFCreateId(String fCreateId) {
  254 + this.fCreateId = fCreateId;
  255 + }
  256 + public String getFCorpOpeStatus() {
  257 + return fCorpOpeStatus;
  258 + }
  259 +
  260 + public void setFCorpOpeStatus(String fCorpOpeStatus) {
  261 + this.fCorpOpeStatus = fCorpOpeStatus;
  262 + }
  263 + public String getFTreasurer() {
  264 + return fTreasurer;
  265 + }
  266 +
  267 + public void setFTreasurer(String fTreasurer) {
  268 + this.fTreasurer = fTreasurer;
  269 + }
  270 + public String getFAccountName() {
  271 + return fAccountName;
  272 + }
  273 +
  274 + public void setFAccountName(String fAccountName) {
  275 + this.fAccountName = fAccountName;
  276 + }
  277 + public String getFAccountBankName() {
  278 + return fAccountBankName;
  279 + }
  280 +
  281 + public void setFAccountBankName(String fAccountBankName) {
  282 + this.fAccountBankName = fAccountBankName;
  283 + }
  284 + public String getFBankAccount() {
  285 + return fBankAccount;
  286 + }
  287 +
  288 + public void setFBankAccount(String fBankAccount) {
  289 + this.fBankAccount = fBankAccount;
  290 + }
  291 + public String getFAccountNature() {
  292 + return fAccountNature;
  293 + }
  294 +
  295 + public void setFAccountNature(String fAccountNature) {
  296 + this.fAccountNature = fAccountNature;
  297 + }
  298 + public String getFCurrency() {
  299 + return fCurrency;
  300 + }
  301 +
  302 + public void setFCurrency(String fCurrency) {
  303 + this.fCurrency = fCurrency;
  304 + }
  305 + public String getFUseStatus() {
  306 + return fUseStatus;
  307 + }
  308 +
  309 + public void setFUseStatus(String fUseStatus) {
  310 + this.fUseStatus = fUseStatus;
  311 + }
  312 + public Long getFFormDataRev() {
  313 + return fFormDataRev;
  314 + }
  315 +
  316 + public void setFFormDataRev(Long fFormDataRev) {
  317 + this.fFormDataRev = fFormDataRev;
  318 + }
  319 + public String getFOrgName() {
  320 + return fOrgName;
  321 + }
  322 +
  323 + public void setFOrgName(String fOrgName) {
  324 + this.fOrgName = fOrgName;
  325 + }
  326 + public String getFOrgId() {
  327 + return fOrgId;
  328 + }
  329 +
  330 + public void setFOrgId(String fOrgId) {
  331 + this.fOrgId = fOrgId;
  332 + }
  333 + public LocalDateTime getFDate() {
  334 + return fDate;
  335 + }
  336 +
  337 + public void setFDate(LocalDateTime fDate) {
  338 + this.fDate = fDate;
  339 + }
  340 + public LocalDateTime getFInspTime() {
  341 + return fInspTime;
  342 + }
  343 +
  344 + public void setFInspTime(LocalDateTime fInspTime) {
  345 + this.fInspTime = fInspTime;
  346 + }
  347 + public String getFInspNotes() {
  348 + return fInspNotes;
  349 + }
  350 +
  351 + public void setFInspNotes(String fInspNotes) {
  352 + this.fInspNotes = fInspNotes;
  353 + }
  354 + public String getFInspBy() {
  355 + return fInspBy;
  356 + }
  357 +
  358 + public void setFInspBy(String fInspBy) {
  359 + this.fInspBy = fInspBy;
  360 + }
  361 + public String getFInspById() {
  362 + return fInspById;
  363 + }
  364 +
  365 + public void setFInspById(String fInspById) {
  366 + this.fInspById = fInspById;
  367 + }
  368 + public String getFUpdateBy() {
  369 + return fUpdateBy;
  370 + }
  371 +
  372 + public void setFUpdateBy(String fUpdateBy) {
  373 + this.fUpdateBy = fUpdateBy;
  374 + }
  375 + public String getFUpdateId() {
  376 + return fUpdateId;
  377 + }
  378 +
  379 + public void setFUpdateId(String fUpdateId) {
  380 + this.fUpdateId = fUpdateId;
  381 + }
  382 + public LocalDateTime getFUpdateTime() {
  383 + return fUpdateTime;
  384 + }
  385 +
  386 + public void setFUpdateTime(LocalDateTime fUpdateTime) {
  387 + this.fUpdateTime = fUpdateTime;
  388 + }
  389 + public String getFInspStatusName() {
  390 + return fInspStatusName;
  391 + }
  392 +
  393 + public void setFInspStatusName(String fInspStatusName) {
  394 + this.fInspStatusName = fInspStatusName;
  395 + }
  396 + public String getFInspId() {
  397 + return fInspId;
  398 + }
  399 +
  400 + public void setFInspId(String fInspId) {
  401 + this.fInspId = fInspId;
  402 + }
  403 + public String getFOrgType() {
  404 + return fOrgType;
  405 + }
  406 +
  407 + public void setFOrgType(String fOrgType) {
  408 + this.fOrgType = fOrgType;
  409 + }
  410 +
  411 +
  412 + @Override
  413 + protected Serializable pkVal() {
  414 + return this.id;
  415 + }
  416 +
  417 + @Override
  418 + public String toString() {
  419 + return "WCurrent{" +
  420 + "id=" + id +
  421 + ", refId=" + refId +
  422 + ", fAccountBalance=" + fAccountBalance +
  423 + ", fAvailableBalance=" + fAvailableBalance +
  424 + ", fFreezeAmount=" + fFreezeAmount +
  425 + ", fFreezing=" + fFreezing +
  426 + ", fNotes=" + fNotes +
  427 + ", fCreateTime=" + fCreateTime +
  428 + ", fCreateBy=" + fCreateBy +
  429 + ", fCreateId=" + fCreateId +
  430 + ", fCorpOpeStatus=" + fCorpOpeStatus +
  431 + ", fTreasurer=" + fTreasurer +
  432 + ", fAccountName=" + fAccountName +
  433 + ", fAccountBankName=" + fAccountBankName +
  434 + ", fBankAccount=" + fBankAccount +
  435 + ", fAccountNature=" + fAccountNature +
  436 + ", fCurrency=" + fCurrency +
  437 + ", fUseStatus=" + fUseStatus +
  438 + ", fFormDataRev=" + fFormDataRev +
  439 + ", fOrgName=" + fOrgName +
  440 + ", fOrgId=" + fOrgId +
  441 + ", fDate=" + fDate +
  442 + ", fInspTime=" + fInspTime +
  443 + ", fInspNotes=" + fInspNotes +
  444 + ", fInspBy=" + fInspBy +
  445 + ", fInspById=" + fInspById +
  446 + ", fUpdateBy=" + fUpdateBy +
  447 + ", fUpdateId=" + fUpdateId +
  448 + ", fUpdateTime=" + fUpdateTime +
  449 + ", fInspStatusName=" + fInspStatusName +
  450 + ", fInspId=" + fInspId +
  451 + ", fOrgType=" + fOrgType +
  452 + "}";
  453 + }
  454 +}
... ...
backend/chkpower/src/main/resources/mapper/WCurrentMapper.xml 0 → 100644
  Diff comments   View file @46f5306
... ... @@ -0,0 +1,102 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.hotent.chkpower.dao.WCurrentDao">
  4 +
  5 + <!-- 通用查询映射结果 -->
  6 + <resultMap id="BaseResultMap" type="com.hotent.chkpower.model.WCurrent">
  7 + <id column="ID_" property="id" />
  8 + <result column="REF_ID_" property="refId" />
  9 + <result column="F_account_balance" property="fAccountBalance" />
  10 + <result column="F_available_balance" property="fAvailableBalance" />
  11 + <result column="F_freeze_amount" property="fFreezeAmount" />
  12 + <result column="F_freezing" property="fFreezing" />
  13 + <result column="F_notes" property="fNotes" />
  14 + <result column="F_create_time" property="fCreateTime" />
  15 + <result column="F_create_by" property="fCreateBy" />
  16 + <result column="F_create_id" property="fCreateId" />
  17 + <result column="F_corp_ope_status" property="fCorpOpeStatus" />
  18 + <result column="F_treasurer" property="fTreasurer" />
  19 + <result column="F_account_name" property="fAccountName" />
  20 + <result column="F_account_bank_name" property="fAccountBankName" />
  21 + <result column="F_bank_account" property="fBankAccount" />
  22 + <result column="F_account_nature" property="fAccountNature" />
  23 + <result column="F_currency" property="fCurrency" />
  24 + <result column="F_use_status" property="fUseStatus" />
  25 + <result column="F_form_data_rev_" property="fFormDataRev" />
  26 + <result column="F_org_name" property="fOrgName" />
  27 + <result column="F_org_id" property="fOrgId" />
  28 + <result column="F_date" property="fDate" />
  29 + <result column="F_insp_time" property="fInspTime" />
  30 + <result column="F_insp_notes" property="fInspNotes" />
  31 + <result column="F_insp_by" property="fInspBy" />
  32 + <result column="F_insp_by_id" property="fInspById" />
  33 + <result column="F_update_by" property="fUpdateBy" />
  34 + <result column="F_update_id" property="fUpdateId" />
  35 + <result column="F_update_time" property="fUpdateTime" />
  36 + <result column="F_insp_status_name" property="fInspStatusName" />
  37 + <result column="F_insp_id" property="fInspId" />
  38 + <result column="F_org_type" property="fOrgType" />
  39 + </resultMap>
  40 +
  41 + <!-- 通用查询结果列 -->
  42 + <sql id="Base_Column_List">
  43 + ID_, REF_ID_, F_account_balance, F_available_balance, F_freeze_amount, F_freezing, F_notes, F_create_time, F_create_by, F_create_id, F_corp_ope_status, F_treasurer, F_account_name, F_account_bank_name, F_bank_account, F_account_nature, F_currency, F_use_status, F_form_data_rev_, F_org_name, F_org_id, F_date, F_insp_time, F_insp_notes, F_insp_by, F_insp_by_id, F_update_by, F_update_id, F_update_time, F_insp_status_name, F_insp_id, F_org_type
  44 + </sql>
  45 +
  46 + <select id="selectPage" resultMap="BaseResultMap">
  47 + select
  48 + <include refid="Base_Column_List"/>
  49 + from
  50 + w_current
  51 + ${ew.customSqlSegment}
  52 + </select>
  53 +
  54 + <select id="selectList" resultMap="BaseResultMap">
  55 + select
  56 + <include refid="Base_Column_List"/>
  57 + from
  58 + w_current
  59 + ${ew.customSqlSegment}
  60 + </select>
  61 +
  62 + <select id="selectById" resultMap="BaseResultMap">
  63 + select
  64 + <include refid="Base_Column_List"/>
  65 + from
  66 + w_current
  67 + where
  68 + ID_ = #{id}
  69 + </select>
  70 +
  71 + <select id="getHistoricalDetail" resultMap="BaseResultMap">
  72 + SELECT org.ID_ as F_org_id,org.NAME_ as F_org_name,acc.F_org_type,
  73 + acc.F_corp_ope_status,acc.F_cashier_name as F_treasurer,acc.F_account_name,acc.F_account_bank_name,acc.F_bank_account,acc.F_account_nature,acc.F_currency,acc.F_use_status,
  74 + zh.F_account_balance, zh.F_available_balance, zh.F_freeze_amount, zh.F_freezing, zh.F_notes
  75 + FROM uc_org org
  76 + JOIN w_bank_account acc ON acc.F_org_id= org.ID_
  77 + LEFT JOIN (
  78 + SELECT c1.F_org_id, c1.F_bank_account, c1.F_date, c1.F_account_balance, c1.F_available_balance, c1.F_freeze_amount, c1.F_freezing, c1.F_notes,c1.id_
  79 + FROM w_current c1
  80 + JOIN (
  81 + SELECT c3.F_org_id, c3.F_bank_account,max(c3.id_) as id_ FROM w_current c3
  82 + JOIN (
  83 + SELECT DISTINCT F_org_id, F_bank_account, MAX(F_date) as MaxDate
  84 + FROM w_current
  85 + GROUP BY F_org_id, F_bank_account
  86 + ) c4 ON c3.F_org_id = c4.F_org_id AND c3.F_bank_account = c4.F_bank_account AND c3.F_date = c4.MaxDate
  87 + GROUP BY c3.F_org_id, c3.F_bank_account
  88 + ) c2
  89 + ON c1.F_org_id = c2.F_org_id AND c1.F_bank_account = c2.F_bank_account AND c1.id_ = c2.id_
  90 + ) zh on zh.F_org_id = acc.F_org_id and zh.F_bank_account = acc.F_bank_account
  91 + WHERE 1=1
  92 + <if test="orgIdList != null and orgIdList.size() > 0">
  93 + and org.ID_ in
  94 + <foreach collection="orgIdList" separator="," item="orgId" open="(" close=")">
  95 + #{orgId}
  96 + </foreach>
  97 + </if>
  98 + <if test="orgIdList == null or orgIdList.size() == 0">
  99 + and 1=2
  100 + </if>
  101 + </select>
  102 +</mapper>
... ...
backend/pom.xml
  Diff comments   View file @46f5306
... ... @@ -51,6 +51,7 @@
51 51 <module>feign-mockmvc</module>
52 52 <module>documentation</module>
53 53 <module>bpm-http-sdk</module>
  54 + <module>chkpower</module>
54 55 <!-- <module>runner</module> -->
55 56 </modules>
56 57  
... ...
frontend/front/public/config.js
  Diff comments   View file @46f5306
1   -// var host = window.location.protocol + '//' + window.location.hostname
  1 +var host = window.location.protocol + '//' + window.location.hostname
2 2 // 当前后端不在同一个服务器时，需要指定host地址
3   -var host = 'http://192.168.145.61'
  3 +// var host = 'http://192.168.0.9'
4 4 // combine为true时五合一部署, 为false时分五个服务部署
5 5 var combine = true
6 6 var defaultModulePortMap = {
... ... @@ -13,7 +13,7 @@ var defaultModulePortMap = {
13 13 }
14 14 window.getModuleRootUrl = function (module) {
15 15 // 默认是全部服务合一的端口
16   - var modulePort = '22581'
  16 + var modulePort = '8076'
17 17 if (!combine) {
18 18 modulePort = defaultModulePortMap[module]
19 19 }
... ...
frontend/front/src/config/setting.config.js
  Diff comments   View file @46f5306
... ... @@ -22,7 +22,7 @@ const setting = {
22 22 //简写
23 23 abbreviation: 'eip',
24 24 //开发环境端口号
25   - devPort: '8081',
  25 + devPort: '22581',
26 26 //版本号
27 27 version: process.env.VUE_APP_VERSION,
28 28 //是否显示页面底部自定义版权信息
... ...
frontend/front/src/views/matter/StartProcess.vue
  Diff comments   View file @46f5306
  1 +<script src="../../../node_modules/hotent-ui/lib/hotent-ui.common.js"></script>
1 2 <template>
2 3 <div class="start-process">
3 4 <flow-form
... ...