合同类调整；添加印章；重置密码

src/main/java/com/qs/serve/modules/data/controller/DataSignetController.java

@@ -0,0 +1,42 @@
+package com.qs.serve.modules.data.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.model.dto.R;
+import com.qs.serve.modules.data.mapper.DataSignetMapper;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import com.qs.serve.modules.data.entity.DataSignet;
+
+import java.util.List;
+
+/**
+ * 数据 印章数据
+ * @author YenHex
+ * @since 2023-07-26
+ */
+@Slf4j
+@AllArgsConstructor
+@RestController
+@RequestMapping("data/signet")
+public class DataSignetController {
+
+    private DataSignetMapper dataSignetMapper;
+
+    /**
+     * 列表
+     * @param param
+     * @return
+     */
+    @GetMapping("/list")
+    public R<List<DataSignet>> getList(DataSignet param){
+        LambdaQueryWrapper<DataSignet> lqw = new LambdaQueryWrapper<>(param);
+        List<DataSignet> list = dataSignetMapper.selectList(lqw);
+        return R.ok(list);
+    }
+
+
+}
+

src/main/java/com/qs/serve/modules/data/entity/DataSignet.java

@@ -0,0 +1,83 @@
+package com.qs.serve.modules.data.entity;
+
+import java.time.LocalDate;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 印章数据 实体类
+ * @author YenHex
+ * @since 2023-07-26
+ */
+@Data
+@TableName("data_signet")
+public class DataSignet implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /** 印章名称 */
+    @NotBlank(message = "印章名称不能为空")
+    @Length(max = 255,message = "印章名称长度不能超过255字")
+    private String name;
+
+    /** 备注 */
+    @Length(max = 255,message = "备注长度不能超过255字")
+    private String remark;
+
+    /** 创建时间 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /** 更新时间 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime updateTime;
+
+    /** 创建人 */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /** 更新人 */
+    @TableField(fill = FieldFill.UPDATE)
+    private String updateBy;
+
+    /** 租户id */
+    @JsonIgnore
+    @JsonProperty
+    private String tenantId;
+
+
+	public static DataSignet toNewObject(DataSignet source){
+		DataSignet signet = new DataSignet();
+		signet.setId(source.getId());
+		signet.setName(source.getName());
+		signet.setRemark(source.getRemark());
+		signet.setCreateTime(source.getCreateTime());
+		signet.setUpdateTime(source.getUpdateTime());
+		signet.setCreateBy(source.getCreateBy());
+		signet.setUpdateBy(source.getUpdateBy());
+		signet.setTenantId(source.getTenantId());
+		return signet;
+	}
+
+}
+

src/main/java/com/qs/serve/modules/data/mapper/DataSignetMapper.java

@@ -0,0 +1,14 @@
+package com.qs.serve.modules.data.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qs.serve.modules.data.entity.DataSignet;
+
+/**
+ * 印章数据 Mapper
+ * @author YenHex
+ * @date 2023-07-26
+ */
+public interface DataSignetMapper extends BaseMapper<DataSignet> {
+
+}
+

src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@@ -173,6 +173,24 @@ public class SysUserController {
         return R.ok(sysUserVo);
     }
 
+
+    /**
+     * (个人)密码更新H5
+     * @param param
+     * @return
+     */
+    @SysLog(title = "人员",desc = "个人密码更新",biz = BizType.UPDATE)
+    @PostMapping("/updatePwdH5")
+    public R<?> updatePwdH5(@RequestBody SysUserPwdParam param){
+        LoginUser loginUser = AuthContextUtils.getLoginUser();
+        SysUser sysUser = new SysUser();
+        sysUser.setId(loginUser.getUserId());
+        sysUser.setPassword(SecureUtil.md5(param.getNewPassword()));
+        sysUser.setUpdateTime(LocalDateTime.now());
+        sysUserService.updateById(sysUser);
+        return R.ok();
+    }
+
     /**
      * (个人)密码更新
      * @param param

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java

@@ -146,6 +146,13 @@ public class TbsCostContractController {
             contract.setAttachIds(param.getAttachIds());
             contract.setSignTime(param.getSignTime());
             contract.setExpireTime(param.getExpireTime());
+            contract.setPayee(param.getPayee());
+            contract.setBankName(param.getBankName());
+            contract.setBankAccount(param.getBankAccount());
+            contract.setSealName(param.getSealName());
+            contract.setSealId(param.getSealId());
+            contract.setSealNum(param.getSealNum());
+            contract.setFileNum(param.getFileNum());
         }
         if(contract.getId()==null){
             tbsCostContractService.save(contract);

src/main/java/com/qs/serve/modules/tbs/entity/TbsCostContract.java

@@ -97,6 +97,35 @@ public class TbsCostContract implements Serializable {
     @JsonProperty
     private String delFlag;
 
+    /** 收款单位 */
+    @Length(max = 255,message = "收款单位长度不能超过255字")
+    private String payee;
+
+    /** 开户银行 */
+    @Length(max = 255,message = "开户银行长度不能超过255字")
+    private String bankName;
+
+    /** 银行账号 */
+    @Length(max = 255,message = "银行账号长度不能超过255字")
+    private String bankAccount;
+
+    /** 印章名称 */
+    @Length(max = 255,message = "印章名称长度不能超过255字")
+    private String sealName;
+
+    /** 印章编号 */
+    @Length(max = 255,message = "印章编号长度不能超过255字")
+    private String sealId;
+
+    /** 使用印章次数 */
+    @Length(max = 255,message = "使用印章次数长度不能超过255字")
+    private Integer sealNum;
+
+    /** 文件份数 */
+    @Length(max = 255,message = "文件份数长度不能超过255字")
+    private Integer fileNum;
+
+
     /** 附件信息列表 */
     @TableField(exist = false)
     private List<?> attachInfoList;

src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostContractBo.java

@@ -51,5 +51,41 @@ public class TbsCostContractBo implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate expireTime;
 
+
+
+    /** 收款单位 */
+    @NotNull(message = "收款单位不能为空")
+    @Length(max = 255,message = "收款单位长度不能超过255字")
+    private String payee;
+
+    /** 开户银行 */
+    @NotNull(message = "开户银行不能为空")
+    @Length(max = 255,message = "开户银行长度不能超过255字")
+    private String bankName;
+
+    /** 银行账号 */
+    @NotNull(message = "银行账号不能为空")
+    @Length(max = 255,message = "银行账号长度不能超过255字")
+    private String bankAccount;
+
+    /** 印章名称 */
+    @Length(max = 255,message = "印章名称长度不能超过255字")
+    private String sealName;
+
+    /** 印章编号 */
+    @NotNull(message = "印章不能为空")
+    @Length(max = 255,message = "印章编号长度不能超过255字")
+    private String sealId;
+
+    /** 使用印章次数 */
+    @NotNull(message = "印章次数不能为空")
+    @Length(max = 255,message = "使用印章次数长度不能超过255字")
+    private Integer sealNum;
+
+    /** 文件份数 */
+    @NotNull(message = "文件份数不能为空")
+    @Length(max = 255,message = "文件份数长度不能超过255字")
+    private Integer fileNum;
+
 }
 

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -28,8 +28,10 @@ import com.qs.serve.modules.erp.mapper.ErpDispatchDataMapper;
 import com.qs.serve.modules.seeyon.entity.BaseCreateCallbackBo;
 import com.qs.serve.modules.seeyon.entity.BaseCreateProcessBo;
 import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
+import com.qs.serve.modules.sys.entity.SysAttach;
 import com.qs.serve.modules.sys.entity.SysConfig;
 import com.qs.serve.modules.sys.entity.SysUser;
+import com.qs.serve.modules.sys.service.SysAttachService;
 import com.qs.serve.modules.sys.service.SysConfigService;
 import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
@@ -97,6 +99,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
     private final ErpDispatchDataMapper dispatchDataMapper;
     private TbsCostContractMapper costContractMapper;
     private VtbVerificationMapper verificationMapper;
+    private SysAttachService sysAttachService;
 
 
     @Override
@@ -291,25 +294,33 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
             data.put("totalExpenseRate",tbsCostApply.getTotalActivityPreNotAmount());
             data.put("remark",tbsCostApply.getRemark());
 
-            data.put("payee","");
-            data.put("bankName","");
-            data.put("bankAccount","");
-            data.put("sealID","");
-            data.put("sealName","");
-            data.put("sealNum","0");
-            data.put("fileNum","0");
-
             LambdaQueryWrapper<TbsCostContract> lqw = new LambdaQueryWrapper<>();
             lqw.eq(TbsCostContract::getCostApplyId,tbsCostApply.getId());
             List<TbsCostContract> contracts = costContractMapper.selectList(lqw);
             if(contracts.size()>0){
                 TbsCostContract contract = contracts.get(0);
+                data.put("payee",contract.getPayee());
+                data.put("bankName",contract.getBankName());
+                data.put("bankAccount",contract.getBankAccount());
+                data.put("sealID",contract.getSealId());
+                data.put("sealName",contract.getSealName());
+                data.put("sealNum",contract.getSealNum());
+                data.put("fileNum",contract.getFileNum());
+
                 data.put("contractName",contract.getContractName());
                 data.put("contractTotalMoney",contract.getContractAmount());
                 data.put("signDate",contract.getSignTime()==null?null:contract.getSignTime().toString());
                 data.put("expireDate",contract.getExpireTime()==null?null:contract.getExpireTime().toString());
                 data.put("contractContent",contract.getContractCondition());
-                data.put("contractFile","");
+                String urls = "";
+                if (CollectionUtil.isNotEmpty(contract.getAttachIds())){
+                    List<String> attachIds = Arrays.asList(contract.getAttachIds());
+                    List<SysAttach> attachList = sysAttachService.listByIds(attachIds);
+                    urls = attachList.stream().map(SysAttach::getPath).collect(Collectors.joining(" , "));
+                }
+                data.put("contractFile",urls);
+            }else {
+                Assert.throwEx("请补充合同信息");
             }
 
             //创建子表数据

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -116,6 +116,10 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         //移除核销相关记录
         this.removeWithVerification(id);
         //判断费用申请类型
+        TbsCostApply costApply = costApplyService.getById(verification.getCostApplyId());
+        if(costApply.getContractFlag().equals(1)){
+
+        }
         //更新活动统计金额
         //更新活动状态
     }