审批流程记录

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecord.java

@@ -15,13 +15,15 @@ import lombok.Data;
 public class ApprovalRecord extends BaseEntity {
 
     //订单sid
-    private double proSid;
+    private String proSid;
     //审批人
     private String approver;
     //审批日期
     private String approvalDate;
     //审批意见
-    private double approvalOpinions;
-
-
+    private String approvalOpinions;
+    //操作 1:通过 2:不通过
+    private String operate;
+    //审批人名
+    private String approverName;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordDetailsVo.java

@@ -15,11 +15,13 @@ public class ApprovalRecordDetailsVo implements Vo {
     private String sid;
 
     //订单sid
-    private double proSid;
+    private String proSid;
     //审批人
     private String approver;
     //审批日期
     private String approvalDate;
     //审批意见
-    private double approvalOpinions;
+    private String approvalOpinions;
+    //操作 1:通过 2:不通过
+    private String operate;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordDto.java

@@ -21,4 +21,6 @@ public class ApprovalRecordDto implements Dto {
     private String approvalDate;
     //审批意见
     private String approvalOpinions;
+    //操作 1:新增申请 2:发起申请 3:通过申请 2:不通过申请
+    private String operate;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordQuery.java

@@ -15,11 +15,13 @@ public class ApprovalRecordQuery implements Query {
     private String sid;
 
     //订单sid
-    private double proSid;
+    private String proSid;
     //审批人
     private String approver;
     //审批日期
     private String approvalDate;
     //审批意见
-    private double approvalOpinions;
+    private String approvalOpinions;
+    //操作 1:通过 2:不通过
+    private String operate;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecordVo.java

@@ -15,11 +15,13 @@ public class ApprovalRecordVo implements Vo {
     private String sid;
 
     //订单sid
-    private double proSid;
+    private String proSid;
     //审批人
     private String approver;
     //审批日期
     private String approvalDate;
     //审批意见
-    private double approvalOpinions;
+    private String approvalOpinions;
+    //操作 1:通过 2:不通过
+    private String operate;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationVo.java

@@ -1,9 +1,12 @@
 package com.yxt.supervise.cyf.api.crudeoiltypeinformation;
 
 import com.yxt.common.core.vo.Vo;
+import com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecordVo;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2023/5/4 14:28

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/procurementdetails/ProcurementDetailsDto.java

@@ -50,4 +50,8 @@ public class ProcurementDetailsDto implements Dto {
     //到货日期
     private String arrivalDate;
     private List<CrudeOilTypeInformationDto> commodityList;
+    //操作 1:新增申请 2:发起申请 3:通过申请 2:不通过申请
+    private String operate;
+    //审批意见
+    private String approvalOpinions;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysuser/SysUser.java

@@ -65,4 +65,8 @@ public class SysUser extends BaseEntity {
 
 	@ApiModelProperty("用户头像")
     private String headImage;
+
+    private String roleSid;
+    private String orgSid;
+    private String postSid;
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordMapper.xml

@@ -15,8 +15,9 @@
 
 
     <select id="selectRecordBySid" resultType="com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecord">
-        select *
-        from approval_record
-        where porSid = #{sid}
+        select a.*,s.userName as approverName
+        from approval_record a
+        left join sys_user s on s.sid=a.approver
+        where proSid = #{sid}
     </select>
 </mapper>

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordService.java

@@ -52,27 +52,8 @@ public class ApprovalRecordService extends MybatisBaseService<ApprovalRecordMapp
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         Date curDate = new Date();
         String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
-        TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid());
-        entity.setRecordDate(dfmt);
-        entity.setExistingInventory(dto.getHeight()*tank.getBottomArea()*tank.getDensity());
-        String [] file=dto.getCrudeOilRecordFile();
-        if(file!=null){
-            List<Map<String,String>> maps=new ArrayList<>();
-            for(String s:file){
-                Map<String,String>m=new HashMap<>();
-                m.put("mainSid",entity.getSid());
-                m.put("url",s);
-                m.put("sid", UUID.randomUUID().toString());
-                maps.add(m);
-            }
-            if(maps.size()>0){
-                baseMapper.insertCrudeOilFiles(maps);
-            }
-        }
         baseMapper.insert(entity);
         //油罐每日填写信息修改
-        tank.setExistingInventory(dto.getHeight()*tank.getBottomArea()*tank.getDensity());
-        tankInformationMapper.updateById(tank);
         return rb.success().setMsg("新增成功");
     }
     public ResultBean update (ApprovalRecordDto dto){

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsRest.java

@@ -54,6 +54,11 @@ public class ProcurementDetailsRest {
     public ResultBean update (@RequestBody ProcurementDetailsDto dto){
         return RawProcurementDetailsService.update(dto);
     }
+    @ApiOperation("修改")
+    @PostMapping("/updateByState")
+    public ResultBean updateByState (@RequestBody ProcurementDetailsDto dto){
+        return RawProcurementDetailsService.updateByState(dto);
+    }
 
     @ApiOperation("根据sid查询")
     @GetMapping("/getProcurementBySid/{sid}")

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsService.java

@@ -1,5 +1,6 @@
 package com.yxt.supervise.cyf.biz.procurementdetails;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,7 +11,9 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecord;
 import com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecordDto;
+import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformation;
 import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationDto;
 import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationVo;
 import com.yxt.supervise.cyf.api.materialinventory.MaterialInventory;
@@ -20,11 +23,13 @@ import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetails;
 import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetailsDto;
 import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetailsQuery;
 import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetailsVo;
+import com.yxt.supervise.cyf.api.sysuser.SysUser;
 import com.yxt.supervise.cyf.biz.approvalrecord.ApprovalRecordMapper;
 import com.yxt.supervise.cyf.biz.approvalrecord.ApprovalRecordService;
 import com.yxt.supervise.cyf.biz.crudeoiltypeinformation.CrudeOilTypeInformationMapper;
 import com.yxt.supervise.cyf.biz.crudeoiltypeinformation.CrudeOilTypeInformationService;
 import com.yxt.supervise.cyf.biz.materialinventory.MaterialInventoryMapper;
+import com.yxt.supervise.cyf.biz.sysuser.CyfSysUserMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,6 +49,8 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
     MaterialInventoryMapper rawMaterialInventoryMapper;
     @Autowired
     ApprovalRecordService approvalRecordService;
+    @Autowired
+    CyfSysUserMapper sysUserMapper;
     public PagerVo<ProcurementDetailsVo> listPageVo(PagerQuery<ProcurementDetailsQuery> pq) {
         ProcurementDetailsQuery query = pq.getParams();
         QueryWrapper<ProcurementDetails> qw = new QueryWrapper<>();
@@ -72,21 +79,22 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
         Date curDate = new Date();
         String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
         ProcurementDetails entity=new ProcurementDetails();
+        System.out.println(StpUtil.getLoginIdAsString());
+        SysUser sysUser=sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id",StpUtil.getLoginIdAsString()));
         if(null==dto.getSid() || ""==dto.getSid()){
             BeanUtil.copyProperties(dto, entity, "id","sid");
-//            ApprovalRecordDto recordDto=new ApprovalRecordDto();
-//            recordDto.setProSid(entity.getSid());
-//            recordDto.setApprover("");
-//            recordDto.getApprovalOpinions();
-//            recordDto.setApprovalDate(dfmt);
-//            approvalRecordService.save(recordDto);
+            ApprovalRecordDto recordDto=new ApprovalRecordDto();
+            recordDto.setProSid(entity.getSid());
+            recordDto.setApprover(sysUser.getSid());
+            recordDto.setApprovalOpinions(dto.getApprovalOpinions());
+            recordDto.setOperate("1");
+            recordDto.setApprovalDate(dfmt);
+            approvalRecordService.save(recordDto);
         }else{
             BeanUtil.copyProperties(dto, entity, "id");
         }
-//        BeanUtil.copyProperties(dto, entity, "id","sid");
         //多个商品
         if(dto.getCommodityList().size()>1){
-            //BeanUtil.copyProperties(dto, entity, "sid");
             for(CrudeOilTypeInformationDto pro:dto.getCommodityList()){
                 entity.setTypeSid(pro.getSid());
                 entity.setState(1);
@@ -97,7 +105,6 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
             }
             return rb.success().setMsg("新增成功");
         }
-
         for(CrudeOilTypeInformationDto pro:dto.getCommodityList()){
             entity.setTypeSid(pro.getSid());
             entity.setState(1);
@@ -114,6 +121,7 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
         String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
         String sid =dto.getSid();
         List<ProcurementDetails> procurementDetails=baseMapper.selectList(new QueryWrapper<ProcurementDetails>().eq("sid",sid));
+        SysUser sysUser=sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id",StpUtil.getLoginIdAsString()));
         //不存在保存加提交
         if(sid.equals("")||sid.equals(null)){
             ProcurementDetails entity=new ProcurementDetails();
@@ -128,12 +136,15 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
                     baseMapper.insert(entity);
                 }
                 //提交记录
-//                ApprovalRecordDto recordDto=new ApprovalRecordDto();
-//                recordDto.setProSid(entity.getSid());
-//                recordDto.setApprover("");
-//                recordDto.getApprovalOpinions();
-//                recordDto.setApprovalDate(dfmt);
-//                approvalRecordService.save(recordDto);
+                ApprovalRecordDto recordDto=new ApprovalRecordDto();
+                recordDto.setProSid(entity.getSid());
+                recordDto.setApprover(sysUser.getSid());
+                recordDto.setApprovalOpinions(dto.getApprovalOpinions());
+                recordDto.setOperate("1");
+                recordDto.setApprovalDate(dfmt);
+                approvalRecordService.save(recordDto);
+                recordDto.setOperate("2");
+                approvalRecordService.save(recordDto);
                 return rb.success().setMsg("新增成功");
             }
             for(CrudeOilTypeInformationDto pro:dto.getCommodityList()){
@@ -151,12 +162,13 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
                 pro.setState(procurementDetails.get(1).getState()+1);
                 baseMapper.updateById(pro);
             }
-//            ApprovalRecordDto recordDto=new ApprovalRecordDto();
-//            recordDto.setProSid(list.get(1).getSid());
-//            recordDto.setApprover("");
-//            recordDto.getApprovalOpinions();
-//            recordDto.setApprovalDate(dfmt);
-//            approvalRecordService.save(recordDto);
+            ApprovalRecordDto recordDto=new ApprovalRecordDto();
+            recordDto.setProSid(list.get(1).getSid());
+            recordDto.setApprover(sysUser.getSid());
+            recordDto.setApprovalOpinions(dto.getApprovalOpinions());
+            recordDto.setOperate(dto.getOperate()==null?"2":dto.getOperate());
+            recordDto.setApprovalDate(dfmt);
+            approvalRecordService.save(recordDto);
         }
         return rb.success().setMsg("提交成功");
     }
@@ -169,6 +181,29 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
         save(dto);
         return rb.success().setMsg("修改成功");
     }
+    public ResultBean updateByState (ProcurementDetailsDto dto){
+        ResultBean rb=new ResultBean();
+        SysUser sysUser=sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id",StpUtil.getLoginIdAsString()));
+        String dtoSid = dto.getSid();
+        ApprovalRecordDto recordDto=new ApprovalRecordDto();
+        List<ProcurementDetails> list=baseMapper.selectList(new QueryWrapper<ProcurementDetails>().eq("sid",dtoSid));
+        if(dto.getOperate().equals("1")){
+            for(ProcurementDetails procurementDetails:list){
+                BeanUtil.copyProperties(dto, procurementDetails, "id","sid");
+                baseMapper.updateById(procurementDetails);
+            }
+            recordDto.setOperate(dto.getOperate());
+        }else{
+            recordDto.setOperate(dto.getOperate());
+        }
+        Date curDate = new Date();
+        String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
+        recordDto.setProSid(dtoSid);
+        recordDto.setApprover(sysUser.getSid());
+        recordDto.setApprovalOpinions(dto.getApprovalOpinions());
+        recordDto.setApprovalDate(dfmt);
+        return rb.success().setMsg("修改成功");
+    }
     public ResultBean getProcurementBySid(String sid){
         ResultBean rb=new ResultBean();
         List<ProcurementDetailsVo> RawProcurementDetails=baseMapper.getProcurementBySid(sid);
@@ -183,7 +218,6 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
         procurementDetailsVo.setCommodityList(list);
         return  rb.success().setData(procurementDetailsVo);
     }
-
     public ResultBean del(String sid){
         ResultBean rb=new ResultBean();
         baseMapper.delete(new QueryWrapper<ProcurementDetails>().eq("sid",sid));

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysuser/CyfSysUserRest.java

@@ -45,6 +45,18 @@ public class CyfSysUserRest {
         }
         return rb.setMsg("登录失败");
     }
+
+    /**
+     * 注销
+     * @return
+     */
+    @ApiOperation("退出登录")
+    @RequestMapping("/signOut")
+    public ResultBean logout() {
+        ResultBean rb =new ResultBean();
+        StpUtil.logout();
+        return rb.setMsg("退出成功");
+    }
     @ApiOperation("根据id查询用户信息")
     @GetMapping("/getUserById/{id}")
     public ResultBean getUserById(@PathVariable String  id) {