diff --git a/backend/assembly/pom.xml b/backend/assembly/pom.xml index 39a8bb3..1d48ea8 100644 --- a/backend/assembly/pom.xml +++ b/backend/assembly/pom.xml @@ -52,6 +52,12 @@ portal ${parent.version} + + + com.hotent + chkpower + ${parent.version} + com.hotent form diff --git a/backend/assembly/src/main/resources/application-dev.yml b/backend/assembly/src/main/resources/application-dev.yml index 04309ff..3de015c 100644 --- a/backend/assembly/src/main/resources/application-dev.yml +++ b/backend/assembly/src/main/resources/application-dev.yml @@ -42,7 +42,7 @@ spring: server: - port: 8088 + port: 6799 # 1. redis.enable=false 时无论redis.caffeine.enabled配置为true还是false均使用caffeine作为缓存 # 2. redis.enable=true 且 redis.caffeine.enabled=false 仅仅使用redis作为缓存 diff --git a/backend/bpm-runtime/src/main/java/com/hotent/runtime/script/ScriptImpl.java b/backend/bpm-runtime/src/main/java/com/hotent/runtime/script/ScriptImpl.java index 8a59fb5..5430e9d 100644 --- a/backend/bpm-runtime/src/main/java/com/hotent/runtime/script/ScriptImpl.java +++ b/backend/bpm-runtime/src/main/java/com/hotent/runtime/script/ScriptImpl.java @@ -5,15 +5,8 @@ import java.text.ParseException; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; -import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -21,9 +14,12 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Resource; +import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.databind.node.*; import com.hotent.base.datasource.DatabaseContext; import com.hotent.base.manager.CommonManager; +import com.hotent.base.util.*; +import com.hotent.base.util.Base64; import com.hotent.runtime.utils.SubCalcUtils; import org.apache.commons.lang.exception.ExceptionUtils; import org.springframework.context.annotation.Primary; @@ -42,13 +38,6 @@ import com.hotent.base.feign.PortalFeignService; import com.hotent.base.feign.UCFeignService; import com.hotent.base.groovy.IScript; import com.hotent.base.model.CommonResult; -import com.hotent.base.util.AppUtil; -import com.hotent.base.util.Base64; -import com.hotent.base.util.BeanUtils; -import com.hotent.base.util.EncryptUtil; -import com.hotent.base.util.FluentUtil; -import com.hotent.base.util.JsonUtil; -import com.hotent.base.util.StringUtil; import com.hotent.base.util.time.DateFormatUtil; import com.hotent.base.util.time.DateUtil; import com.hotent.base.util.time.TimeUtil; @@ -1783,5 +1772,96 @@ public class ScriptImpl implements IScript { return SubCalcUtils.subFieldNotContain(subArray, field, op, value, dateType); } + //当前登陆用户的ID + private static final String LOGIN_USER = "loginUser"; + //当前登陆用户所属组织的ID + private static final String LOGIN_USER_ORGS = "loginUserOrgs"; + //当前登陆用户所属组织及下属组织的ID + private static final String LOGIN_USER_SUB_ORGS = "loginUserSubOrgs"; + //当前登陆用户所属组织及所有下属组织的ID + private static final String LOGIN_USER_ALL_SUB_ORGS = "loginUserAllSubOrgs"; + //当前登录用户所在组织 所有上下 组织id + private static final String LOGIN_USER_ALL_ORGS = "loginUserAllOrgs"; + public ArrayList getDataPermission(String type) { + ArrayList orgIds = new ArrayList(); + IUser currentUser = ContextUtil.getCurrentUser(); + if (BeanUtils.isNotEmpty(type)) { + if (LOGIN_USER.equals(type)) { + orgIds.add(currentUser.getUserId()); + } else if (LOGIN_USER_ORGS.equals(type)) { + String currentUserOrgIds = currentUser.getAttrbuite("CURRENT_USER_ORGIDS"); + if (StringUtil.isNotEmpty(currentUserOrgIds)) { + String[] oids = currentUserOrgIds.split(","); + Set oidSet = new HashSet(Arrays.asList(oids)); + orgIds.addAll(oidSet); + } + } else if (LOGIN_USER_SUB_ORGS.equals(type)) { + String currentUserSubOrgIds = StringUtil.isNotEmpty(AuthenticationUtil.getCurrentUserSubOrgIds()) ? AuthenticationUtil.getCurrentUserSubOrgIds() : ""; + String currentUserOrgIds = StringUtil.isNotEmpty(AuthenticationUtil.getCurrentUserOrgIds()) ? AuthenticationUtil.getCurrentUserOrgIds() : ""; + currentUserSubOrgIds += "," + currentUserOrgIds; + String[] oids = new String[]{}; + if (StringUtil.isNotEmpty(currentUserSubOrgIds)) { + oids = currentUserSubOrgIds.split(","); + } + if (oids.length == 0) { + oids = new String[]{"-1"}; + } + Set oidSet = new HashSet(Arrays.asList(oids)); + orgIds.addAll(oidSet); + } else if (LOGIN_USER_ALL_SUB_ORGS.equals(type)) { + String currentUserSubOrgIds = StringUtil.isNotEmpty(AuthenticationUtil.getCurrentUserSubOrgIds()) ? AuthenticationUtil.getCurrentUserSubOrgIds() : ""; + String currentUserOrgIds = StringUtil.isNotEmpty(AuthenticationUtil.getCurrentUserOrgIds()) ? AuthenticationUtil.getCurrentUserOrgIds() : ""; + currentUserSubOrgIds += "," + currentUserOrgIds; + String[] oids = new String[]{}; + if (StringUtil.isNotEmpty(currentUserSubOrgIds)) { + oids = currentUserSubOrgIds.split(","); + } + if (oids.length == 0) { + oids = new String[]{"-1"}; + } + Set oidSet = new HashSet<>(Arrays.asList(oids)); + orgIds.addAll(oidSet); + } else if (LOGIN_USER_ALL_ORGS.equals(type)) { + ArrayNode department = uCFeignService.getOrgListByUserId(getCurrentUserId()); + for (JsonNode node : department) { + //所有上级组织 + ObjectNode dept = (ObjectNode) node; + String id = dept.get("id").asText(); + String path = dept.get("path").asText(); + String[] pathlist = path.split("\\."); + Set oidSet1 = new HashSet<>(Arrays.asList(pathlist)); + orgIds.addAll(oidSet1); + //所有下级组织 +// String currentUserSubOrgIds = StringUtil.isNotEmpty(AuthenticationUtil.getCurrentUserSubOrgIds()) ? AuthenticationUtil.getCurrentUserSubOrgIds() : ""; +// String currentUserOrgIds = StringUtil.isNotEmpty(AuthenticationUtil.getCurrentUserOrgIds()) ? AuthenticationUtil.getCurrentUserOrgIds() : ""; +// currentUserSubOrgIds += "," + currentUserOrgIds; +// String[] oids = new String[]{}; +// if (StringUtil.isNotEmpty(currentUserSubOrgIds)) { +// oids = currentUserSubOrgIds.split(","); +// } +// if (oids.length == 0) { +// oids = new String[]{"-1"}; +// } +// Set oidSet = new HashSet<>(Arrays.asList(oids)); + Set oidSet = new HashSet<>(); + List orgsByparentId = uCFeignService.getChildOrg(id);//从数据库取下属组织数据，解决缓存中的组织不全问题 + if (ObjectUtil.isNotEmpty(orgsByparentId)) { + for (ObjectNode jsonNodes : orgsByparentId) { + oidSet.add(jsonNodes.get("id").asText()); + } + } + String currentUserOrgIds = StringUtil.isNotEmpty(AuthenticationUtil.getCurrentUserOrgIds()) ? AuthenticationUtil.getCurrentUserOrgIds() : ""; + if (ObjectUtil.isNotEmpty(currentUserOrgIds)) { + oidSet.add(currentUserOrgIds); + } + orgIds.addAll(oidSet); + + } + } + + } + return orgIds; + } + } diff --git a/backend/chkpower/pom.xml b/backend/chkpower/pom.xml new file mode 100644 index 0000000..9232da7 --- /dev/null +++ b/backend/chkpower/pom.xml @@ -0,0 +1,117 @@ + + + + eip + com.hotent + 8.2.1-peony + + 4.0.0 + + chkpower + chkpower + chkpower + + + + org.springframework + spring-web + + + + org.projectlombok + lombok + 1.18.20 + + + + com.hotent + bpm-runtime + 8.2.1-peony + compile + + + + com.hotent + base + 8.2.1-peony + compile + + + + junit + junit + 4.13.2 + test + + + com.baomidou + mybatis-plus-annotation + 3.4.2 + + + + cn.hutool + hutool-all + + + com.hotent + uc + 8.2.1-peony + + + com.hotent + bo + 8.2.1-peony + + + + + com.alibaba + fastjson + 1.2.39 + + + + com.tencentcloudapi + tencentcloud-sdk-java + 3.1.328 + + + com.aliyun + aliyun-java-sdk-core + 4.4.6 + compile + + + com.aliyun + aliyun-java-sdk-dysmsapi + 1.1.0 + compile + + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + xls + + + + + + diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WCurrentController.java b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WCurrentController.java new file mode 100644 index 0000000..bb293a5 --- /dev/null +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WCurrentController.java @@ -0,0 +1,66 @@ +package com.hotent.chkpower.controller; + + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import com.hotent.base.model.CommonResult; +import com.hotent.base.util.StringUtil; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.web.bind.annotation.RestController; +import com.hotent.base.controller.BaseController; +import com.hotent.chkpower.model.WCurrent; +import com.hotent.chkpower.manager.WCurrentManager; + +import java.util.List; + +/** + * 活期账户 前端控制器 + * + * @company 广州宏天软件股份有限公司 + * @author cw + * @since 2024-07-05 + */ +@RestController +@RequestMapping("/wCurrent/v1/") +public class WCurrentController extends BaseController { + + /** + * 根据id获取活期账户数据详情 + * @param id + * @return + * @throws Exception + * ModelAndView + */ + @GetMapping(value="/getDetail") + @ApiOperation(value="根据id获取活期账户数据详情",httpMethod = "GET",notes = "根据id获取活期账户数据详情") + public CommonResult getDetail(@ApiParam(name="id",value="业务对象主键", required = true)@RequestParam(required=true) String id) throws Exception{ + return CommonResult.ok().value(baseService.getDetail(id)); + } + /** + * 新增,更新活期账户 + * @param wCurrent + * @throws Exception + * @return + * @exception + */ + @PostMapping(value="/save") + @ApiOperation(value = "新增,更新活期账户数据", httpMethod = "POST", notes = "新增,更新活期账户数据") + public CommonResult save(@ApiParam(name="WCurrent",value="活期账户对象", required = true)@RequestBody WCurrent wCurrent) throws Exception{ + String msg = StringUtil.isEmpty(wCurrent.getId()) ? "添加活期账户成功" : "更新活期账户成功"; + baseService.createOrUpdate(wCurrent); + return CommonResult.ok().message(msg); + } + + @GetMapping(value="/getHistoricalDetail") + public CommonResult getHistoricalDetail() throws Exception{ + List data = baseService.getHistoricalDetail(); + return new CommonResult(true, "成功", data); + } + + + +} diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WCurrentDao.java b/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WCurrentDao.java new file mode 100644 index 0000000..f42ba1b --- /dev/null +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WCurrentDao.java @@ -0,0 +1,23 @@ +package com.hotent.chkpower.dao; + +import com.hotent.chkpower.model.WCurrent; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.ArrayList; +import java.util.List; + +/** + * 活期账户 Mapper 接口 + * + * @company 广州宏天软件股份有限公司 + * @author cw + * @since 2024-07-05 + */ +public interface WCurrentDao extends BaseMapper { + + List getHistoricalDetail( @Param("orgIdList") ArrayList orgIdList); + + + +} diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WCurrentManager.java b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WCurrentManager.java new file mode 100644 index 0000000..4317c42 --- /dev/null +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WCurrentManager.java @@ -0,0 +1,33 @@ +package com.hotent.chkpower.manager; + +import com.hotent.chkpower.model.WCurrent; +import com.hotent.base.manager.BaseManager; + +import java.util.List; + +/** + * 活期账户 服务类 + * + * @company 广州宏天软件股份有限公司 + * @author cw + * @since 2024-07-05 + */ +public interface WCurrentManager extends BaseManager { + /** + * 根据主键获取详情 + * @param id + * @return + */ + WCurrent getDetail(String id); + /** + * 新建、更新活期账户 + * @param wCurrent + * @return + */ + void createOrUpdate(WCurrent wCurrent); + + List getHistoricalDetail(); + + + +} diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentManagerImpl.java b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentManagerImpl.java new file mode 100644 index 0000000..83515b1 --- /dev/null +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WCurrentManagerImpl.java @@ -0,0 +1,50 @@ +package com.hotent.chkpower.manager.impl; + +import com.hotent.chkpower.model.WCurrent; +import com.hotent.chkpower.dao.WCurrentDao; +import com.hotent.chkpower.manager.WCurrentManager; +import com.hotent.base.manager.impl.BaseManagerImpl; +import com.hotent.runtime.script.ScriptImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import javax.annotation.Resource; +import com.hotent.base.util.BeanUtils; + + +/** + * 活期账户 服务实现类 + * + * @company 广州宏天软件股份有限公司 + * @author cw + * @since 2024-07-05 + */ +@Service +public class WCurrentManagerImpl extends BaseManagerImpl implements WCurrentManager { + @Resource + private ScriptImpl script; + + @Override + public WCurrent getDetail(String id) { + WCurrent wCurrent = this.get(id); + return wCurrent; + } + @Override + @Transactional + public void createOrUpdate(WCurrent wCurrent) { + //新建或更新 + this.saveOrUpdate(wCurrent); + } + + @Override + public List getHistoricalDetail() { + ArrayList orgIdList = script.getDataPermission("loginUserAllSubOrgs"); + List data= baseMapper.getHistoricalDetail(orgIdList); + + return data; + } +} diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/model/WCurrent.java b/backend/chkpower/src/main/java/com/hotent/chkpower/model/WCurrent.java new file mode 100644 index 0000000..b5b8efe --- /dev/null +++ b/backend/chkpower/src/main/java/com/hotent/chkpower/model/WCurrent.java @@ -0,0 +1,454 @@ +package com.hotent.chkpower.model; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.hotent.base.entity.BaseModel; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.JsonProperty; +/** + * 活期账户 + * + * @company 广州宏天软件股份有限公司 + * @author cw + * @since 2024-07-05 + */ +@ApiModel(value="WCurrent对象", description="活期账户") +public class WCurrent extends BaseModel { + + private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "主键") + @TableId(value = "ID_", type = IdType.ASSIGN_ID) + @JsonProperty("id") + private String id; + + @ApiModelProperty(value = "外键") + @TableField("REF_ID_") + @JsonProperty("refId") + private String refId; + + @ApiModelProperty(value = "账户余额") + @TableField("F_account_balance") + @JsonProperty("fAccountBalance") + private BigDecimal fAccountBalance; + + @ApiModelProperty(value = "账户可用余额") + @TableField("F_available_balance") + @JsonProperty("fAvailableBalance") + private BigDecimal fAvailableBalance; + + @ApiModelProperty(value = "被冻结金额") + @TableField("F_freeze_amount") + @JsonProperty("fFreezeAmount") + private BigDecimal fFreezeAmount; + + @ApiModelProperty(value = "冻结上限") + @TableField("F_freezing") + @JsonProperty("fFreezing") + private BigDecimal fFreezing; + + @ApiModelProperty(value = "备注") + @TableField("F_notes") + @JsonProperty("fNotes") + private String fNotes; + + @ApiModelProperty(value = "创建时间") + @TableField("F_create_time") + @JsonProperty("fCreateTime") + private LocalDateTime fCreateTime; + + @ApiModelProperty(value = "创建人") + @TableField("F_create_by") + @JsonProperty("fCreateBy") + private String fCreateBy; + + @ApiModelProperty(value = "创建人id") + @TableField("F_create_id") + @JsonProperty("fCreateId") + private String fCreateId; + + @ApiModelProperty(value = "公司状态") + @TableField("F_corp_ope_status") + @JsonProperty("fCorpOpeStatus") + private String fCorpOpeStatus; + + @ApiModelProperty(value = "负责出纳") + @TableField("F_treasurer") + @JsonProperty("fTreasurer") + private String fTreasurer; + + @ApiModelProperty(value = "账户名称") + @TableField("F_account_name") + @JsonProperty("fAccountName") + private String fAccountName; + + @ApiModelProperty(value = "开户机构") + @TableField("F_account_bank_name") + @JsonProperty("fAccountBankName") + private String fAccountBankName; + + @ApiModelProperty(value = "账号") + @TableField("F_bank_account") + @JsonProperty("fBankAccount") + private String fBankAccount; + + @ApiModelProperty(value = "账户性质") + @TableField("F_account_nature") + @JsonProperty("fAccountNature") + private String fAccountNature; + + @ApiModelProperty(value = "账户币种") + @TableField("F_currency") + @JsonProperty("fCurrency") + private String fCurrency; + + @ApiModelProperty(value = "账户使用状态") + @TableField("F_use_status") + @JsonProperty("fUseStatus") + private String fUseStatus; + + @ApiModelProperty(value = "表单数据版本") + @TableField("F_form_data_rev_") + @JsonProperty("fFormDataRev") + private Long fFormDataRev; + + @ApiModelProperty(value = "公司名称") + @TableField("F_org_name") + @JsonProperty("fOrgName") + private String fOrgName; + + @ApiModelProperty(value = "公司id") + @TableField("F_org_id") + @JsonProperty("fOrgId") + private String fOrgId; + + @ApiModelProperty(value = "日期") + @TableField("F_date") + @JsonProperty("fDate") + private LocalDateTime fDate; + + @ApiModelProperty(value = "核对时间") + @TableField("F_insp_time") + @JsonProperty("fInspTime") + private LocalDateTime fInspTime; + + @ApiModelProperty(value = "核对说明备注") + @TableField("F_insp_notes") + @JsonProperty("fInspNotes") + private String fInspNotes; + + @ApiModelProperty(value = "核对人") + @TableField("F_insp_by") + @JsonProperty("fInspBy") + private String fInspBy; + + @ApiModelProperty(value = "核对人ID") + @TableField("F_insp_by_id") + @JsonProperty("fInspById") + private String fInspById; + + @ApiModelProperty(value = "修改人") + @TableField("F_update_by") + @JsonProperty("fUpdateBy") + private String fUpdateBy; + + @ApiModelProperty(value = "修改人id") + @TableField("F_update_id") + @JsonProperty("fUpdateId") + private String fUpdateId; + + @ApiModelProperty(value = "修改时间") + @TableField("F_update_time") + @JsonProperty("fUpdateTime") + private LocalDateTime fUpdateTime; + + @ApiModelProperty(value = "核对状态") + @TableField("F_insp_status_name") + @JsonProperty("fInspStatusName") + private String fInspStatusName; + + @ApiModelProperty(value = "核对人ID") + @TableField("F_insp_id") + @JsonProperty("fInspId") + private String fInspId; + + @ApiModelProperty(value = "公司类型") + @TableField("F_org_type") + @JsonProperty("fOrgType") + private String fOrgType; + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getRefId() { + return refId; + } + + public void setRefId(String refId) { + this.refId = refId; + } + public BigDecimal getFAccountBalance() { + return fAccountBalance; + } + + public void setFAccountBalance(BigDecimal fAccountBalance) { + this.fAccountBalance = fAccountBalance; + } + public BigDecimal getFAvailableBalance() { + return fAvailableBalance; + } + + public void setFAvailableBalance(BigDecimal fAvailableBalance) { + this.fAvailableBalance = fAvailableBalance; + } + public BigDecimal getFFreezeAmount() { + return fFreezeAmount; + } + + public void setFFreezeAmount(BigDecimal fFreezeAmount) { + this.fFreezeAmount = fFreezeAmount; + } + public BigDecimal getFFreezing() { + return fFreezing; + } + + public void setFFreezing(BigDecimal fFreezing) { + this.fFreezing = fFreezing; + } + public String getFNotes() { + return fNotes; + } + + public void setFNotes(String fNotes) { + this.fNotes = fNotes; + } + public LocalDateTime getFCreateTime() { + return fCreateTime; + } + + public void setFCreateTime(LocalDateTime fCreateTime) { + this.fCreateTime = fCreateTime; + } + public String getFCreateBy() { + return fCreateBy; + } + + public void setFCreateBy(String fCreateBy) { + this.fCreateBy = fCreateBy; + } + public String getFCreateId() { + return fCreateId; + } + + public void setFCreateId(String fCreateId) { + this.fCreateId = fCreateId; + } + public String getFCorpOpeStatus() { + return fCorpOpeStatus; + } + + public void setFCorpOpeStatus(String fCorpOpeStatus) { + this.fCorpOpeStatus = fCorpOpeStatus; + } + public String getFTreasurer() { + return fTreasurer; + } + + public void setFTreasurer(String fTreasurer) { + this.fTreasurer = fTreasurer; + } + public String getFAccountName() { + return fAccountName; + } + + public void setFAccountName(String fAccountName) { + this.fAccountName = fAccountName; + } + public String getFAccountBankName() { + return fAccountBankName; + } + + public void setFAccountBankName(String fAccountBankName) { + this.fAccountBankName = fAccountBankName; + } + public String getFBankAccount() { + return fBankAccount; + } + + public void setFBankAccount(String fBankAccount) { + this.fBankAccount = fBankAccount; + } + public String getFAccountNature() { + return fAccountNature; + } + + public void setFAccountNature(String fAccountNature) { + this.fAccountNature = fAccountNature; + } + public String getFCurrency() { + return fCurrency; + } + + public void setFCurrency(String fCurrency) { + this.fCurrency = fCurrency; + } + public String getFUseStatus() { + return fUseStatus; + } + + public void setFUseStatus(String fUseStatus) { + this.fUseStatus = fUseStatus; + } + public Long getFFormDataRev() { + return fFormDataRev; + } + + public void setFFormDataRev(Long fFormDataRev) { + this.fFormDataRev = fFormDataRev; + } + public String getFOrgName() { + return fOrgName; + } + + public void setFOrgName(String fOrgName) { + this.fOrgName = fOrgName; + } + public String getFOrgId() { + return fOrgId; + } + + public void setFOrgId(String fOrgId) { + this.fOrgId = fOrgId; + } + public LocalDateTime getFDate() { + return fDate; + } + + public void setFDate(LocalDateTime fDate) { + this.fDate = fDate; + } + public LocalDateTime getFInspTime() { + return fInspTime; + } + + public void setFInspTime(LocalDateTime fInspTime) { + this.fInspTime = fInspTime; + } + public String getFInspNotes() { + return fInspNotes; + } + + public void setFInspNotes(String fInspNotes) { + this.fInspNotes = fInspNotes; + } + public String getFInspBy() { + return fInspBy; + } + + public void setFInspBy(String fInspBy) { + this.fInspBy = fInspBy; + } + public String getFInspById() { + return fInspById; + } + + public void setFInspById(String fInspById) { + this.fInspById = fInspById; + } + public String getFUpdateBy() { + return fUpdateBy; + } + + public void setFUpdateBy(String fUpdateBy) { + this.fUpdateBy = fUpdateBy; + } + public String getFUpdateId() { + return fUpdateId; + } + + public void setFUpdateId(String fUpdateId) { + this.fUpdateId = fUpdateId; + } + public LocalDateTime getFUpdateTime() { + return fUpdateTime; + } + + public void setFUpdateTime(LocalDateTime fUpdateTime) { + this.fUpdateTime = fUpdateTime; + } + public String getFInspStatusName() { + return fInspStatusName; + } + + public void setFInspStatusName(String fInspStatusName) { + this.fInspStatusName = fInspStatusName; + } + public String getFInspId() { + return fInspId; + } + + public void setFInspId(String fInspId) { + this.fInspId = fInspId; + } + public String getFOrgType() { + return fOrgType; + } + + public void setFOrgType(String fOrgType) { + this.fOrgType = fOrgType; + } + + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "WCurrent{" + + "id=" + id + + ", refId=" + refId + + ", fAccountBalance=" + fAccountBalance + + ", fAvailableBalance=" + fAvailableBalance + + ", fFreezeAmount=" + fFreezeAmount + + ", fFreezing=" + fFreezing + + ", fNotes=" + fNotes + + ", fCreateTime=" + fCreateTime + + ", fCreateBy=" + fCreateBy + + ", fCreateId=" + fCreateId + + ", fCorpOpeStatus=" + fCorpOpeStatus + + ", fTreasurer=" + fTreasurer + + ", fAccountName=" + fAccountName + + ", fAccountBankName=" + fAccountBankName + + ", fBankAccount=" + fBankAccount + + ", fAccountNature=" + fAccountNature + + ", fCurrency=" + fCurrency + + ", fUseStatus=" + fUseStatus + + ", fFormDataRev=" + fFormDataRev + + ", fOrgName=" + fOrgName + + ", fOrgId=" + fOrgId + + ", fDate=" + fDate + + ", fInspTime=" + fInspTime + + ", fInspNotes=" + fInspNotes + + ", fInspBy=" + fInspBy + + ", fInspById=" + fInspById + + ", fUpdateBy=" + fUpdateBy + + ", fUpdateId=" + fUpdateId + + ", fUpdateTime=" + fUpdateTime + + ", fInspStatusName=" + fInspStatusName + + ", fInspId=" + fInspId + + ", fOrgType=" + fOrgType + + "}"; + } +} diff --git a/backend/chkpower/src/main/resources/mapper/WCurrentMapper.xml b/backend/chkpower/src/main/resources/mapper/WCurrentMapper.xml new file mode 100644 index 0000000..79c9875 --- /dev/null +++ b/backend/chkpower/src/main/resources/mapper/WCurrentMapper.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + + + diff --git a/backend/pom.xml b/backend/pom.xml index a9fd675..cba5c5e 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -51,6 +51,7 @@ feign-mockmvc documentation bpm-http-sdk + chkpower diff --git a/frontend/front/public/config.js b/frontend/front/public/config.js index 1ebdaee..922b48a 100644 --- a/frontend/front/public/config.js +++ b/frontend/front/public/config.js @@ -1,6 +1,6 @@ -// var host = window.location.protocol + '//' + window.location.hostname +var host = window.location.protocol + '//' + window.location.hostname // 当前后端不在同一个服务器时，需要指定host地址 -var host = 'http://192.168.145.61' +// var host = 'http://192.168.0.9' // combine为true时五合一部署, 为false时分五个服务部署 var combine = true var defaultModulePortMap = { @@ -13,7 +13,7 @@ var defaultModulePortMap = { } window.getModuleRootUrl = function (module) { // 默认是全部服务合一的端口 - var modulePort = '22581' + var modulePort = '8076' if (!combine) { modulePort = defaultModulePortMap[module] } diff --git a/frontend/front/src/config/setting.config.js b/frontend/front/src/config/setting.config.js index bac5b71..735da9c 100644 --- a/frontend/front/src/config/setting.config.js +++ b/frontend/front/src/config/setting.config.js @@ -22,7 +22,7 @@ const setting = { //简写 abbreviation: 'eip', //开发环境端口号 - devPort: '8081', + devPort: '22581', //版本号 version: process.env.VUE_APP_VERSION, //是否显示页面底部自定义版权信息 diff --git a/frontend/front/src/views/matter/StartProcess.vue b/frontend/front/src/views/matter/StartProcess.vue index 8aef716..8575e78 100644 --- a/frontend/front/src/views/matter/StartProcess.vue +++ b/frontend/front/src/views/matter/StartProcess.vue @@ -1,3 +1,4 @@ +