新增单据转换设置功能

api-admin/pom.xml

@@ -351,9 +351,9 @@
                 <profiles.active>pro</profiles.active>
             </properties>
             <!--是否默认，默认打包开发环境配置-->
-            <activation>
+<!--            <activation>-->
-                <activeByDefault>true</activeByDefault>
+<!--                <activeByDefault>true</activeByDefault>-->
-            </activation>
+<!--            </activation>-->
         </profile>
         <profile>
             <!--开发-->

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicBusTypeChangeController.java

@@ -0,0 +1,92 @@
+package com.glxp.sale.admin.controller.basic;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
+import com.glxp.sale.admin.entity.basic.BasicBusTypeChangeEntity;
+import com.glxp.sale.admin.req.basic.BasicBusTypeChangeRequest;
+import com.glxp.sale.admin.req.info.DeleteRequest;
+import com.glxp.sale.admin.res.PageSimpleResponse;
+import com.glxp.sale.admin.res.basic.BasicBusTypeChangeResponse;
+import com.glxp.sale.admin.service.basic.BasicBusTypeChangeService;
+import com.glxp.sale.common.enums.ResultEnum;
+import com.glxp.sale.common.res.BaseResponse;
+import com.glxp.sale.common.util.ResultVOUtils;
+import org.springframework.validation.BindingResult;
+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.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+public class BasicBusTypeChangeController {
+
+    @Resource
+    BasicBusTypeChangeService basicBusTypeChangeService;
+
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/basic/bustype/change/filter")
+    public BaseResponse filterJoinList(BasicBusTypeChangeRequest basicBusTypeChangeRequest,
+                                       BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BasicBusTypeChangeResponse> basicBusTypeChangeEntities;
+        basicBusTypeChangeEntities = basicBusTypeChangeService.filterJoinList(
+                basicBusTypeChangeRequest);
+        PageInfo<BasicBusTypeChangeResponse> pageInfo;
+        pageInfo = new PageInfo<>(basicBusTypeChangeEntities);
+        PageSimpleResponse<BasicBusTypeChangeResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(basicBusTypeChangeEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+    @PostMapping("/basic/bustype/change/insert")
+    public BaseResponse insertBusType(@RequestBody @Valid BasicBusTypeChangeEntity basicBusTypeChangeEntity,
+                                      BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        basicBusTypeChangeEntity.setUpdateTime(new Date());
+        basicBusTypeChangeService.insertBusType(basicBusTypeChangeEntity);
+        return ResultVOUtils.success("更新成功");
+    }
+
+    @PostMapping("/basic/bustype/change/update")
+    public BaseResponse updateBusType(@RequestBody @Valid BasicBusTypeChangeEntity basicBusTypeChangeEntity,
+                                      BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        basicBusTypeChangeEntity.setUpdateTime(new Date());
+        basicBusTypeChangeService.updateBasicBusTypeChange(basicBusTypeChangeEntity);
+        return ResultVOUtils.success("更新成功");
+    }
+
+
+    @PostMapping("/basic/bustype/change/delete")
+    public BaseResponse delBussinessType(@RequestBody DeleteRequest deleteRequest,
+                                         BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        if (deleteRequest != null) {
+            basicBusTypeChangeService.deleteById(deleteRequest.getId());
+        } else {
+            return ResultVOUtils.error(999, "参数错误");
+        }
+        return ResultVOUtils.success("更新成功");
+    }
+
+}

api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java

@@ -106,7 +106,7 @@ public class SupCompanyController {
     @PostMapping("/api/pur/modifyCompany")
     public BaseResponse modifyCompany(@RequestBody SupCompanyEntity companyEntity) {
 
-        if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) {
+        if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN || companyEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE) {
             //提交审核
             FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
             filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY);

api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicBusTypeChangeDao.java

@@ -0,0 +1,25 @@
+package com.glxp.sale.admin.dao.basic;
+
+import com.glxp.sale.admin.entity.basic.BasicBusTypeChangeEntity;
+import com.glxp.sale.admin.req.basic.BasicBusTypeChangeRequest;
+import com.glxp.sale.admin.res.basic.BasicBusTypeChangeResponse;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface BasicBusTypeChangeDao {
+
+
+    List<BasicBusTypeChangeEntity> filterList(BasicBusTypeChangeRequest basicBusTypeChangeRequest);
+
+    List<BasicBusTypeChangeResponse> filterJoinList(BasicBusTypeChangeRequest basicBusTypeChangeRequest);
+
+    boolean insertBusType(BasicBusTypeChangeEntity basicBusTypeChangeEntity);
+
+    boolean updateBasicBusTypeChange(BasicBusTypeChangeEntity basicBusTypeChangeEntity);
+
+    boolean deleteById(@Param("id") String id);
+
+}

api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicBusTypeChangeEntity.java

@@ -0,0 +1,23 @@
+package com.glxp.sale.admin.entity.basic;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class BasicBusTypeChangeEntity {
+
+    private Integer id;
+    private String originAction;
+    private String originName;
+    private String targetBusAction;
+    private String targetScAction;
+    private Integer type;
+    private Date updateTime;
+    private String remark;
+    private boolean enable;
+
+
+
+
+}

api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicBusTypeChangeRequest.java

@@ -0,0 +1,13 @@
+package com.glxp.sale.admin.req.basic;
+
+import com.glxp.sale.admin.req.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class BasicBusTypeChangeRequest extends ListPageRequest {
+
+    private String originAction;
+    private Boolean enable;
+    private Integer type;
+    private String lastUpdateTime;
+}

api-admin/src/main/java/com/glxp/sale/admin/res/basic/BasicBusTypeChangeResponse.java

@@ -0,0 +1,10 @@
+package com.glxp.sale.admin.res.basic;
+
+import com.glxp.sale.admin.entity.basic.BasicBusTypeChangeEntity;
+import lombok.Data;
+
+@Data
+public class BasicBusTypeChangeResponse extends BasicBusTypeChangeEntity {
+
+    private String targetBusName;
+}

api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicBusTypeChangeService.java

@@ -0,0 +1,24 @@
+package com.glxp.sale.admin.service.basic;
+
+import com.glxp.sale.admin.entity.basic.BasicBusTypeChangeEntity;
+import com.glxp.sale.admin.req.basic.BasicBusTypeChangeRequest;
+import com.glxp.sale.admin.res.basic.BasicBusTypeChangeResponse;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public interface BasicBusTypeChangeService {
+
+    BasicBusTypeChangeEntity findByAction(String action);
+
+    List<BasicBusTypeChangeResponse> filterJoinList(BasicBusTypeChangeRequest basicBusTypeChangeRequest);
+
+    boolean insertBusType(BasicBusTypeChangeEntity basicBusTypeChangeEntity);
+
+    List<BasicBusTypeChangeEntity> filterList(BasicBusTypeChangeRequest basicBusTypeChangeRequest);
+
+    boolean updateBasicBusTypeChange(BasicBusTypeChangeEntity basicBusTypeChangeEntity);
+
+    boolean deleteById(String id);
+}

api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicBusTypeChangeServiceImpl.java

@@ -0,0 +1,75 @@
+package com.glxp.sale.admin.service.basic.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.PageHelper;
+import com.glxp.sale.admin.dao.basic.BasicBusTypeChangeDao;
+import com.glxp.sale.admin.entity.basic.BasicBusTypeChangeEntity;
+import com.glxp.sale.admin.req.basic.BasicBusTypeChangeRequest;
+import com.glxp.sale.admin.res.basic.BasicBusTypeChangeResponse;
+import com.glxp.sale.admin.service.basic.BasicBusTypeChangeService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class BasicBusTypeChangeServiceImpl implements BasicBusTypeChangeService {
+
+    @Resource
+    BasicBusTypeChangeDao basicBusTypeChangeDao;
+
+    @Override
+    public BasicBusTypeChangeEntity findByAction(String action) {
+
+        if (StrUtil.isNotEmpty(action)) {
+            BasicBusTypeChangeRequest basicBusTypeChangeRequest = new BasicBusTypeChangeRequest();
+            basicBusTypeChangeRequest.setOriginAction(action);
+            List<BasicBusTypeChangeEntity> basicBusTypeChangeEntities = basicBusTypeChangeDao.filterList(basicBusTypeChangeRequest);
+            if (CollUtil.isNotEmpty(basicBusTypeChangeEntities)) {
+                return basicBusTypeChangeEntities.get(0);
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public List<BasicBusTypeChangeResponse> filterJoinList(BasicBusTypeChangeRequest basicBusTypeChangeRequest) {
+        if (basicBusTypeChangeRequest == null) {
+            return Collections.emptyList();
+        }
+        if (basicBusTypeChangeRequest.getPage() != null) {
+            int offset = (basicBusTypeChangeRequest.getPage() - 1) * basicBusTypeChangeRequest.getLimit();
+            PageHelper.offsetPage(offset, basicBusTypeChangeRequest.getLimit());
+        }
+        return basicBusTypeChangeDao.filterJoinList(basicBusTypeChangeRequest);
+    }
+
+    @Override
+    public boolean insertBusType(BasicBusTypeChangeEntity basicBusTypeChangeEntity) {
+        return basicBusTypeChangeDao.insertBusType(basicBusTypeChangeEntity);
+    }
+
+    @Override
+    public List<BasicBusTypeChangeEntity> filterList(BasicBusTypeChangeRequest basicBusTypeChangeRequest) {
+        if (basicBusTypeChangeRequest == null) {
+            return Collections.emptyList();
+        }
+        if (basicBusTypeChangeRequest.getPage() != null) {
+            int offset = (basicBusTypeChangeRequest.getPage() - 1) * basicBusTypeChangeRequest.getLimit();
+            PageHelper.offsetPage(offset, basicBusTypeChangeRequest.getLimit());
+        }
+        return basicBusTypeChangeDao.filterList(basicBusTypeChangeRequest);
+    }
+
+    @Override
+    public boolean updateBasicBusTypeChange(BasicBusTypeChangeEntity basicBusTypeChangeEntity) {
+        return basicBusTypeChangeDao.updateBasicBusTypeChange(basicBusTypeChangeEntity);
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return basicBusTypeChangeDao.deleteById(id);
+    }
+}

api-admin/src/main/resources/application-dev.properties

@@ -1,7 +1,7 @@
 # \u751F\u4EA7\u73AF\u5883
 server.port=9906
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_za?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://192.168.0.55:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=123456
 spring.datasource.hikari.connection-timeout=60000

api-admin/src/main/resources/application-pro.properties

@@ -1,9 +1,9 @@
 # \u751F\u4EA7\u73AF\u5883
 server.port=9996
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://192.168.0.55:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
-spring.datasource.password=Glxp@6066
+spring.datasource.password=123456
 spring.datasource.hikari.connection-timeout=60000
 spring.datasource.hikari.maximum-pool-size=60
 spring.datasource.hikari.minimum-idle=10

api-admin/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=test1
+spring.profiles.active=pro
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 

api-admin/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.sale.admin.dao.basic.BasicBusTypeChangeDao">
+
+    <select id="filterList" parameterType="com.glxp.sale.admin.req.basic.BasicBusTypeChangeRequest"
+            resultType="com.glxp.sale.admin.entity.basic.BasicBusTypeChangeEntity">
+        SELECT * FROM basic_bustype_change
+        <where>
+            <if test="originAction != ''and originAction != null">
+                AND originAction = #{originAction}
+            </if>
+            <if test="enable != null">
+                AND `enable` = #{enable}
+            </if>
+            <if test="type != null">
+                AND `type` = #{type}
+            </if>
+            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
+        </where>
+    </select>
+
+    <select id="filterJoinList" parameterType="com.glxp.sale.admin.req.basic.BasicBusTypeChangeRequest"
+            resultType="com.glxp.sale.admin.res.basic.BasicBusTypeChangeResponse">
+        SELECT basic_bustype_change.* ,basic_bustype_local.name targetBusName FROM basic_bustype_change left join
+        basic_bustype_local
+        on basic_bustype_change.targetBusAction = basic_bustype_local.action
+        <where>
+            <if test="originAction != ''and originAction != null">
+                AND basic_bustype_change.originAction = #{originAction}
+            </if>
+            <if test="enable != null">
+                AND basic_bustype_change.`enable` = #{enable}
+            </if>
+            <if test="type != null">
+                AND basic_bustype_change.`type` = #{type}
+            </if>
+            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+                <![CDATA[   and DATE_FORMAT(basic_bustype_change.updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
+        </where>
+    </select>
+
+
+    <insert id="insertBusType" keyProperty="id" useGeneratedKeys="true"
+            parameterType="com.glxp.sale.admin.entity.basic.BasicBusTypeChangeEntity">
+        insert
+        INTO basic_bustype_change
+        (`originAction`, originName, `targetBusAction`, targetScAction, `type`, updateTime, remark, enable)
+        values (#{originAction},
+                #{originName},
+                #{targetBusAction},
+                #{targetScAction},
+                #{type}, #{updateTime}, #{remark}, #{enable})
+    </insert>
+
+    <update id="updateBasicBusTypeChange" parameterType="com.glxp.sale.admin.entity.basic.BasicBusTypeChangeEntity">
+        UPDATE basic_bustype_change
+        <trim prefix="set" suffixOverrides=",">
+            <if test="originAction != null">originAction = #{originAction},</if>
+            <if test="originName != null">originName = #{originName},</if>
+            <if test="enable != null">enable = #{enable},</if>
+            <if test="targetBusAction != null">targetBusAction = #{targetBusAction},</if>
+            <if test="targetScAction != null">targetScAction = #{targetScAction},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+            <if test="type != null">`type` = #{type},</if>
+        </trim>
+        WHERE id = #{id}
+    </update>
+
+    <delete id="deleteById" parameterType="Map">
+        DELETE
+        FROM basic_bustype_change
+        WHERE id = #{id}
+    </delete>
+
+</mapper>