From 152d04873b1191efd0e13730df2c1a48b4a53685 Mon Sep 17 00:00:00 2001 From: whb <17803890193@163.com> Date: Tue, 16 Jul 2024 14:07:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=90=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StuConceptBlockController.java | 16 +- .../controller/UserController.java | 2 +- .../digital_credit/entity/StuBaseInfo.java | 91 ++- .../entity/StuBaseInfoExample.java | 560 ++++++++++++++++++ .../mapper/StuBaseInfoMapper.java | 4 +- .../resources/mappers/StuBaseInfoMapper.xml | 140 ++++- 6 files changed, 794 insertions(+), 19 deletions(-) diff --git a/credit/src/main/java/com/sztzjy/digital_credit/controller/StuConceptBlockController.java b/credit/src/main/java/com/sztzjy/digital_credit/controller/StuConceptBlockController.java index 257cf7c..7ce7a9d 100644 --- a/credit/src/main/java/com/sztzjy/digital_credit/controller/StuConceptBlockController.java +++ b/credit/src/main/java/com/sztzjy/digital_credit/controller/StuConceptBlockController.java @@ -65,7 +65,7 @@ public class StuConceptBlockController { public ResultEntity getBlockResources(@RequestBody JSONObject upCodeJson) { //虚拟空间路径 - String pyPath = "/mnt/py/"; + String pyPath = "/usr/local/tianzeProject/py/"; System.out.println(upCodeJson); String pythonCodeUp = upCodeJson.getString("code"); @@ -85,14 +85,14 @@ public class StuConceptBlockController { String s = IdUtil.simpleUUID(); // 写入临时Python文件 - String tempPythonFile = "/usr/local/Aitem/py/py/"+s+".py"; + String tempPythonFile = "/usr/local/tianzeProject/py/code/"+s+".py"; try (PrintWriter out = new PrintWriter(tempPythonFile)){ out.println(pythonCode); } - String[] command = {"docker", "exec", "python521", "python", pyPath+s+".py"}; + String[] command = {"docker", "exec", "pyexe", "python", tempPythonFile}; // 创建一个新的进程来执行Python代码 Process process = Runtime.getRuntime().exec(command); @@ -157,11 +157,11 @@ public class StuConceptBlockController { try { - String pyCode = "/mnt/py/"; - String pyPath = "/mnt/py/img/"; + String pyCode = "/usr/local/tianzeProject/py/code/"; + String pyPath = "/usr/local/tianzeProject/py/img/"; // 写入临时Python文件 - String tempPythonFile = "/usr/local/Aitem/py/py/"+s+".py"; + String tempPythonFile =pyCode+s+".py"; String pyFile = "/usr/local/Aitem/py/py/img/"; List stringList = new ArrayList<>(); @@ -409,15 +409,13 @@ public class StuConceptBlockController { example.createCriteria().andResourcesNameEqualTo(name); List stuResources = stuResourcesMapper.selectByExample(example); - return new ResultEntity<>(HttpStatus.OK,"获取成功","uploadFile"+stuResources.get(0).getResourcesUrl()); + return new ResultEntity<>(HttpStatus.OK,"获取成功","report"+stuResources.get(0).getResourcesUrl()); } @GetMapping("/getResource") @ApiOperation("获取视频流") @AnonymousAccess public ResponseEntity streamVideo(@RequestParam String module, @RequestParam String name, HttpServletResponse response) { - - StuResourcesExample example = new StuResourcesExample(); example.createCriteria().andModuleEqualTo(module).andResourcesNameEqualTo(name); List stuResources = stuResourcesMapper.selectByExample(example); diff --git a/credit/src/main/java/com/sztzjy/digital_credit/controller/UserController.java b/credit/src/main/java/com/sztzjy/digital_credit/controller/UserController.java index 59aec31..16b0aff 100644 --- a/credit/src/main/java/com/sztzjy/digital_credit/controller/UserController.java +++ b/credit/src/main/java/com/sztzjy/digital_credit/controller/UserController.java @@ -102,7 +102,7 @@ public class UserController { String token = TokenProvider.createToken(jwtUser); loginResult.setUserId(stuUser.getUserId()); - loginResult.setUsername(stuUser.getSchoolId()); + loginResult.setUsername(stuUser.getName()); loginResult.setRoleId(stuUser.getRoleId()); loginResult.setSchoolId(Integer.valueOf(stuUser.getSchoolId())); loginResult.setAccessToken(token); diff --git a/credit/src/main/java/com/sztzjy/digital_credit/entity/StuBaseInfo.java b/credit/src/main/java/com/sztzjy/digital_credit/entity/StuBaseInfo.java index 8ca2ec8..7992114 100644 --- a/credit/src/main/java/com/sztzjy/digital_credit/entity/StuBaseInfo.java +++ b/credit/src/main/java/com/sztzjy/digital_credit/entity/StuBaseInfo.java @@ -4,8 +4,9 @@ import java.util.Date; import io.swagger.annotations.ApiModelProperty; /** + * 企业基本信息 * - * @author tz + * @author whb * stu_base_info */ public class StuBaseInfo { @@ -108,6 +109,30 @@ public class StuBaseInfo { @ApiModelProperty("提交状态") private Integer subState; + @ApiModelProperty("股东名称三") + private String shareholderThird; + + @ApiModelProperty("股东名称三持股比率") + private String shareholderThirdRatio; + + @ApiModelProperty("股东名称四") + private String shareholderFourth; + + @ApiModelProperty("股东名称四持股比率") + private String shareholderFourthRatio; + + @ApiModelProperty("股东名称五") + private String shareholderFive; + + @ApiModelProperty("股东名称五持股比率") + private String shareholderFiveRatio; + + @ApiModelProperty("股东名称六") + private String shareholderSix; + + @ApiModelProperty("股东名称六持股比率") + private String shareholderSixRatio; + public String getId() { return id; } @@ -371,4 +396,68 @@ public class StuBaseInfo { public void setSubState(Integer subState) { this.subState = subState; } + + public String getShareholderThird() { + return shareholderThird; + } + + public void setShareholderThird(String shareholderThird) { + this.shareholderThird = shareholderThird == null ? null : shareholderThird.trim(); + } + + public String getShareholderThirdRatio() { + return shareholderThirdRatio; + } + + public void setShareholderThirdRatio(String shareholderThirdRatio) { + this.shareholderThirdRatio = shareholderThirdRatio == null ? null : shareholderThirdRatio.trim(); + } + + public String getShareholderFourth() { + return shareholderFourth; + } + + public void setShareholderFourth(String shareholderFourth) { + this.shareholderFourth = shareholderFourth == null ? null : shareholderFourth.trim(); + } + + public String getShareholderFourthRatio() { + return shareholderFourthRatio; + } + + public void setShareholderFourthRatio(String shareholderFourthRatio) { + this.shareholderFourthRatio = shareholderFourthRatio == null ? null : shareholderFourthRatio.trim(); + } + + public String getShareholderFive() { + return shareholderFive; + } + + public void setShareholderFive(String shareholderFive) { + this.shareholderFive = shareholderFive == null ? null : shareholderFive.trim(); + } + + public String getShareholderFiveRatio() { + return shareholderFiveRatio; + } + + public void setShareholderFiveRatio(String shareholderFiveRatio) { + this.shareholderFiveRatio = shareholderFiveRatio == null ? null : shareholderFiveRatio.trim(); + } + + public String getShareholderSix() { + return shareholderSix; + } + + public void setShareholderSix(String shareholderSix) { + this.shareholderSix = shareholderSix == null ? null : shareholderSix.trim(); + } + + public String getShareholderSixRatio() { + return shareholderSixRatio; + } + + public void setShareholderSixRatio(String shareholderSixRatio) { + this.shareholderSixRatio = shareholderSixRatio == null ? null : shareholderSixRatio.trim(); + } } \ No newline at end of file diff --git a/credit/src/main/java/com/sztzjy/digital_credit/entity/StuBaseInfoExample.java b/credit/src/main/java/com/sztzjy/digital_credit/entity/StuBaseInfoExample.java index 01d012c..e5ec1e7 100644 --- a/credit/src/main/java/com/sztzjy/digital_credit/entity/StuBaseInfoExample.java +++ b/credit/src/main/java/com/sztzjy/digital_credit/entity/StuBaseInfoExample.java @@ -2354,6 +2354,566 @@ public class StuBaseInfoExample { addCriterion("sub_state not between", value1, value2, "subState"); return (Criteria) this; } + + public Criteria andShareholderThirdIsNull() { + addCriterion("shareholder_third is null"); + return (Criteria) this; + } + + public Criteria andShareholderThirdIsNotNull() { + addCriterion("shareholder_third is not null"); + return (Criteria) this; + } + + public Criteria andShareholderThirdEqualTo(String value) { + addCriterion("shareholder_third =", value, "shareholderThird"); + return (Criteria) this; + } + + public Criteria andShareholderThirdNotEqualTo(String value) { + addCriterion("shareholder_third <>", value, "shareholderThird"); + return (Criteria) this; + } + + public Criteria andShareholderThirdGreaterThan(String value) { + addCriterion("shareholder_third >", value, "shareholderThird"); + return (Criteria) this; + } + + public Criteria andShareholderThirdGreaterThanOrEqualTo(String value) { + addCriterion("shareholder_third >=", value, "shareholderThird"); + return (Criteria) this; + } + + public Criteria andShareholderThirdLessThan(String value) { + addCriterion("shareholder_third <", value, "shareholderThird"); + return (Criteria) this; + } + + public Criteria andShareholderThirdLessThanOrEqualTo(String value) { + addCriterion("shareholder_third <=", value, "shareholderThird"); + return (Criteria) this; + } + + public Criteria andShareholderThirdLike(String value) { + addCriterion("shareholder_third like", value, "shareholderThird"); + return (Criteria) this; + } + + public Criteria andShareholderThirdNotLike(String value) { + addCriterion("shareholder_third not like", value, "shareholderThird"); + return (Criteria) this; + } + + public Criteria andShareholderThirdIn(List values) { + addCriterion("shareholder_third in", values, "shareholderThird"); + return (Criteria) this; + } + + public Criteria andShareholderThirdNotIn(List values) { + addCriterion("shareholder_third not in", values, "shareholderThird"); + return (Criteria) this; + } + + public Criteria andShareholderThirdBetween(String value1, String value2) { + addCriterion("shareholder_third between", value1, value2, "shareholderThird"); + return (Criteria) this; + } + + public Criteria andShareholderThirdNotBetween(String value1, String value2) { + addCriterion("shareholder_third not between", value1, value2, "shareholderThird"); + return (Criteria) this; + } + + public Criteria andShareholderThirdRatioIsNull() { + addCriterion("shareholder_third_ratio is null"); + return (Criteria) this; + } + + public Criteria andShareholderThirdRatioIsNotNull() { + addCriterion("shareholder_third_ratio is not null"); + return (Criteria) this; + } + + public Criteria andShareholderThirdRatioEqualTo(String value) { + addCriterion("shareholder_third_ratio =", value, "shareholderThirdRatio"); + return (Criteria) this; + } + + public Criteria andShareholderThirdRatioNotEqualTo(String value) { + addCriterion("shareholder_third_ratio <>", value, "shareholderThirdRatio"); + return (Criteria) this; + } + + public Criteria andShareholderThirdRatioGreaterThan(String value) { + addCriterion("shareholder_third_ratio >", value, "shareholderThirdRatio"); + return (Criteria) this; + } + + public Criteria andShareholderThirdRatioGreaterThanOrEqualTo(String value) { + addCriterion("shareholder_third_ratio >=", value, "shareholderThirdRatio"); + return (Criteria) this; + } + + public Criteria andShareholderThirdRatioLessThan(String value) { + addCriterion("shareholder_third_ratio <", value, "shareholderThirdRatio"); + return (Criteria) this; + } + + public Criteria andShareholderThirdRatioLessThanOrEqualTo(String value) { + addCriterion("shareholder_third_ratio <=", value, "shareholderThirdRatio"); + return (Criteria) this; + } + + public Criteria andShareholderThirdRatioLike(String value) { + addCriterion("shareholder_third_ratio like", value, "shareholderThirdRatio"); + return (Criteria) this; + } + + public Criteria andShareholderThirdRatioNotLike(String value) { + addCriterion("shareholder_third_ratio not like", value, "shareholderThirdRatio"); + return (Criteria) this; + } + + public Criteria andShareholderThirdRatioIn(List values) { + addCriterion("shareholder_third_ratio in", values, "shareholderThirdRatio"); + return (Criteria) this; + } + + public Criteria andShareholderThirdRatioNotIn(List values) { + addCriterion("shareholder_third_ratio not in", values, "shareholderThirdRatio"); + return (Criteria) this; + } + + public Criteria andShareholderThirdRatioBetween(String value1, String value2) { + addCriterion("shareholder_third_ratio between", value1, value2, "shareholderThirdRatio"); + return (Criteria) this; + } + + public Criteria andShareholderThirdRatioNotBetween(String value1, String value2) { + addCriterion("shareholder_third_ratio not between", value1, value2, "shareholderThirdRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFourthIsNull() { + addCriterion("shareholder_fourth is null"); + return (Criteria) this; + } + + public Criteria andShareholderFourthIsNotNull() { + addCriterion("shareholder_fourth is not null"); + return (Criteria) this; + } + + public Criteria andShareholderFourthEqualTo(String value) { + addCriterion("shareholder_fourth =", value, "shareholderFourth"); + return (Criteria) this; + } + + public Criteria andShareholderFourthNotEqualTo(String value) { + addCriterion("shareholder_fourth <>", value, "shareholderFourth"); + return (Criteria) this; + } + + public Criteria andShareholderFourthGreaterThan(String value) { + addCriterion("shareholder_fourth >", value, "shareholderFourth"); + return (Criteria) this; + } + + public Criteria andShareholderFourthGreaterThanOrEqualTo(String value) { + addCriterion("shareholder_fourth >=", value, "shareholderFourth"); + return (Criteria) this; + } + + public Criteria andShareholderFourthLessThan(String value) { + addCriterion("shareholder_fourth <", value, "shareholderFourth"); + return (Criteria) this; + } + + public Criteria andShareholderFourthLessThanOrEqualTo(String value) { + addCriterion("shareholder_fourth <=", value, "shareholderFourth"); + return (Criteria) this; + } + + public Criteria andShareholderFourthLike(String value) { + addCriterion("shareholder_fourth like", value, "shareholderFourth"); + return (Criteria) this; + } + + public Criteria andShareholderFourthNotLike(String value) { + addCriterion("shareholder_fourth not like", value, "shareholderFourth"); + return (Criteria) this; + } + + public Criteria andShareholderFourthIn(List values) { + addCriterion("shareholder_fourth in", values, "shareholderFourth"); + return (Criteria) this; + } + + public Criteria andShareholderFourthNotIn(List values) { + addCriterion("shareholder_fourth not in", values, "shareholderFourth"); + return (Criteria) this; + } + + public Criteria andShareholderFourthBetween(String value1, String value2) { + addCriterion("shareholder_fourth between", value1, value2, "shareholderFourth"); + return (Criteria) this; + } + + public Criteria andShareholderFourthNotBetween(String value1, String value2) { + addCriterion("shareholder_fourth not between", value1, value2, "shareholderFourth"); + return (Criteria) this; + } + + public Criteria andShareholderFourthRatioIsNull() { + addCriterion("shareholder_fourth_ratio is null"); + return (Criteria) this; + } + + public Criteria andShareholderFourthRatioIsNotNull() { + addCriterion("shareholder_fourth_ratio is not null"); + return (Criteria) this; + } + + public Criteria andShareholderFourthRatioEqualTo(String value) { + addCriterion("shareholder_fourth_ratio =", value, "shareholderFourthRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFourthRatioNotEqualTo(String value) { + addCriterion("shareholder_fourth_ratio <>", value, "shareholderFourthRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFourthRatioGreaterThan(String value) { + addCriterion("shareholder_fourth_ratio >", value, "shareholderFourthRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFourthRatioGreaterThanOrEqualTo(String value) { + addCriterion("shareholder_fourth_ratio >=", value, "shareholderFourthRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFourthRatioLessThan(String value) { + addCriterion("shareholder_fourth_ratio <", value, "shareholderFourthRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFourthRatioLessThanOrEqualTo(String value) { + addCriterion("shareholder_fourth_ratio <=", value, "shareholderFourthRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFourthRatioLike(String value) { + addCriterion("shareholder_fourth_ratio like", value, "shareholderFourthRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFourthRatioNotLike(String value) { + addCriterion("shareholder_fourth_ratio not like", value, "shareholderFourthRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFourthRatioIn(List values) { + addCriterion("shareholder_fourth_ratio in", values, "shareholderFourthRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFourthRatioNotIn(List values) { + addCriterion("shareholder_fourth_ratio not in", values, "shareholderFourthRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFourthRatioBetween(String value1, String value2) { + addCriterion("shareholder_fourth_ratio between", value1, value2, "shareholderFourthRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFourthRatioNotBetween(String value1, String value2) { + addCriterion("shareholder_fourth_ratio not between", value1, value2, "shareholderFourthRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFiveIsNull() { + addCriterion("shareholder_five is null"); + return (Criteria) this; + } + + public Criteria andShareholderFiveIsNotNull() { + addCriterion("shareholder_five is not null"); + return (Criteria) this; + } + + public Criteria andShareholderFiveEqualTo(String value) { + addCriterion("shareholder_five =", value, "shareholderFive"); + return (Criteria) this; + } + + public Criteria andShareholderFiveNotEqualTo(String value) { + addCriterion("shareholder_five <>", value, "shareholderFive"); + return (Criteria) this; + } + + public Criteria andShareholderFiveGreaterThan(String value) { + addCriterion("shareholder_five >", value, "shareholderFive"); + return (Criteria) this; + } + + public Criteria andShareholderFiveGreaterThanOrEqualTo(String value) { + addCriterion("shareholder_five >=", value, "shareholderFive"); + return (Criteria) this; + } + + public Criteria andShareholderFiveLessThan(String value) { + addCriterion("shareholder_five <", value, "shareholderFive"); + return (Criteria) this; + } + + public Criteria andShareholderFiveLessThanOrEqualTo(String value) { + addCriterion("shareholder_five <=", value, "shareholderFive"); + return (Criteria) this; + } + + public Criteria andShareholderFiveLike(String value) { + addCriterion("shareholder_five like", value, "shareholderFive"); + return (Criteria) this; + } + + public Criteria andShareholderFiveNotLike(String value) { + addCriterion("shareholder_five not like", value, "shareholderFive"); + return (Criteria) this; + } + + public Criteria andShareholderFiveIn(List values) { + addCriterion("shareholder_five in", values, "shareholderFive"); + return (Criteria) this; + } + + public Criteria andShareholderFiveNotIn(List values) { + addCriterion("shareholder_five not in", values, "shareholderFive"); + return (Criteria) this; + } + + public Criteria andShareholderFiveBetween(String value1, String value2) { + addCriterion("shareholder_five between", value1, value2, "shareholderFive"); + return (Criteria) this; + } + + public Criteria andShareholderFiveNotBetween(String value1, String value2) { + addCriterion("shareholder_five not between", value1, value2, "shareholderFive"); + return (Criteria) this; + } + + public Criteria andShareholderFiveRatioIsNull() { + addCriterion("shareholder_five_ratio is null"); + return (Criteria) this; + } + + public Criteria andShareholderFiveRatioIsNotNull() { + addCriterion("shareholder_five_ratio is not null"); + return (Criteria) this; + } + + public Criteria andShareholderFiveRatioEqualTo(String value) { + addCriterion("shareholder_five_ratio =", value, "shareholderFiveRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFiveRatioNotEqualTo(String value) { + addCriterion("shareholder_five_ratio <>", value, "shareholderFiveRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFiveRatioGreaterThan(String value) { + addCriterion("shareholder_five_ratio >", value, "shareholderFiveRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFiveRatioGreaterThanOrEqualTo(String value) { + addCriterion("shareholder_five_ratio >=", value, "shareholderFiveRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFiveRatioLessThan(String value) { + addCriterion("shareholder_five_ratio <", value, "shareholderFiveRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFiveRatioLessThanOrEqualTo(String value) { + addCriterion("shareholder_five_ratio <=", value, "shareholderFiveRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFiveRatioLike(String value) { + addCriterion("shareholder_five_ratio like", value, "shareholderFiveRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFiveRatioNotLike(String value) { + addCriterion("shareholder_five_ratio not like", value, "shareholderFiveRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFiveRatioIn(List values) { + addCriterion("shareholder_five_ratio in", values, "shareholderFiveRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFiveRatioNotIn(List values) { + addCriterion("shareholder_five_ratio not in", values, "shareholderFiveRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFiveRatioBetween(String value1, String value2) { + addCriterion("shareholder_five_ratio between", value1, value2, "shareholderFiveRatio"); + return (Criteria) this; + } + + public Criteria andShareholderFiveRatioNotBetween(String value1, String value2) { + addCriterion("shareholder_five_ratio not between", value1, value2, "shareholderFiveRatio"); + return (Criteria) this; + } + + public Criteria andShareholderSixIsNull() { + addCriterion("shareholder_six is null"); + return (Criteria) this; + } + + public Criteria andShareholderSixIsNotNull() { + addCriterion("shareholder_six is not null"); + return (Criteria) this; + } + + public Criteria andShareholderSixEqualTo(String value) { + addCriterion("shareholder_six =", value, "shareholderSix"); + return (Criteria) this; + } + + public Criteria andShareholderSixNotEqualTo(String value) { + addCriterion("shareholder_six <>", value, "shareholderSix"); + return (Criteria) this; + } + + public Criteria andShareholderSixGreaterThan(String value) { + addCriterion("shareholder_six >", value, "shareholderSix"); + return (Criteria) this; + } + + public Criteria andShareholderSixGreaterThanOrEqualTo(String value) { + addCriterion("shareholder_six >=", value, "shareholderSix"); + return (Criteria) this; + } + + public Criteria andShareholderSixLessThan(String value) { + addCriterion("shareholder_six <", value, "shareholderSix"); + return (Criteria) this; + } + + public Criteria andShareholderSixLessThanOrEqualTo(String value) { + addCriterion("shareholder_six <=", value, "shareholderSix"); + return (Criteria) this; + } + + public Criteria andShareholderSixLike(String value) { + addCriterion("shareholder_six like", value, "shareholderSix"); + return (Criteria) this; + } + + public Criteria andShareholderSixNotLike(String value) { + addCriterion("shareholder_six not like", value, "shareholderSix"); + return (Criteria) this; + } + + public Criteria andShareholderSixIn(List values) { + addCriterion("shareholder_six in", values, "shareholderSix"); + return (Criteria) this; + } + + public Criteria andShareholderSixNotIn(List values) { + addCriterion("shareholder_six not in", values, "shareholderSix"); + return (Criteria) this; + } + + public Criteria andShareholderSixBetween(String value1, String value2) { + addCriterion("shareholder_six between", value1, value2, "shareholderSix"); + return (Criteria) this; + } + + public Criteria andShareholderSixNotBetween(String value1, String value2) { + addCriterion("shareholder_six not between", value1, value2, "shareholderSix"); + return (Criteria) this; + } + + public Criteria andShareholderSixRatioIsNull() { + addCriterion("shareholder_six_ratio is null"); + return (Criteria) this; + } + + public Criteria andShareholderSixRatioIsNotNull() { + addCriterion("shareholder_six_ratio is not null"); + return (Criteria) this; + } + + public Criteria andShareholderSixRatioEqualTo(String value) { + addCriterion("shareholder_six_ratio =", value, "shareholderSixRatio"); + return (Criteria) this; + } + + public Criteria andShareholderSixRatioNotEqualTo(String value) { + addCriterion("shareholder_six_ratio <>", value, "shareholderSixRatio"); + return (Criteria) this; + } + + public Criteria andShareholderSixRatioGreaterThan(String value) { + addCriterion("shareholder_six_ratio >", value, "shareholderSixRatio"); + return (Criteria) this; + } + + public Criteria andShareholderSixRatioGreaterThanOrEqualTo(String value) { + addCriterion("shareholder_six_ratio >=", value, "shareholderSixRatio"); + return (Criteria) this; + } + + public Criteria andShareholderSixRatioLessThan(String value) { + addCriterion("shareholder_six_ratio <", value, "shareholderSixRatio"); + return (Criteria) this; + } + + public Criteria andShareholderSixRatioLessThanOrEqualTo(String value) { + addCriterion("shareholder_six_ratio <=", value, "shareholderSixRatio"); + return (Criteria) this; + } + + public Criteria andShareholderSixRatioLike(String value) { + addCriterion("shareholder_six_ratio like", value, "shareholderSixRatio"); + return (Criteria) this; + } + + public Criteria andShareholderSixRatioNotLike(String value) { + addCriterion("shareholder_six_ratio not like", value, "shareholderSixRatio"); + return (Criteria) this; + } + + public Criteria andShareholderSixRatioIn(List values) { + addCriterion("shareholder_six_ratio in", values, "shareholderSixRatio"); + return (Criteria) this; + } + + public Criteria andShareholderSixRatioNotIn(List values) { + addCriterion("shareholder_six_ratio not in", values, "shareholderSixRatio"); + return (Criteria) this; + } + + public Criteria andShareholderSixRatioBetween(String value1, String value2) { + addCriterion("shareholder_six_ratio between", value1, value2, "shareholderSixRatio"); + return (Criteria) this; + } + + public Criteria andShareholderSixRatioNotBetween(String value1, String value2) { + addCriterion("shareholder_six_ratio not between", value1, value2, "shareholderSixRatio"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/credit/src/main/java/com/sztzjy/digital_credit/mapper/StuBaseInfoMapper.java b/credit/src/main/java/com/sztzjy/digital_credit/mapper/StuBaseInfoMapper.java index c82efe9..90f9928 100644 --- a/credit/src/main/java/com/sztzjy/digital_credit/mapper/StuBaseInfoMapper.java +++ b/credit/src/main/java/com/sztzjy/digital_credit/mapper/StuBaseInfoMapper.java @@ -3,10 +3,8 @@ package com.sztzjy.digital_credit.mapper; import com.sztzjy.digital_credit.entity.StuBaseInfo; import com.sztzjy.digital_credit.entity.StuBaseInfoExample; import java.util.List; - -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -@Mapper + public interface StuBaseInfoMapper { long countByExample(StuBaseInfoExample example); diff --git a/credit/src/main/resources/mappers/StuBaseInfoMapper.xml b/credit/src/main/resources/mappers/StuBaseInfoMapper.xml index e4ecbf3..dc807c5 100644 --- a/credit/src/main/resources/mappers/StuBaseInfoMapper.xml +++ b/credit/src/main/resources/mappers/StuBaseInfoMapper.xml @@ -35,6 +35,14 @@ + + + + + + + + @@ -100,7 +108,9 @@ org_code, tex_identifi_number, tax_qualification, business_term, date_of_approval, reg_auth, number_of_insure_person, company_reg_address, business_scope, shareholder_name, sharehold_ratio, shareholder_name_two, sharehold_ratio_two, credit_code, case_name, - case_detail, user_id, create_time, update_time, error_number, sub_state + case_detail, user_id, create_time, update_time, error_number, sub_state, shareholder_third, + shareholder_third_ratio, shareholder_fourth, shareholder_fourth_ratio, shareholder_five, + shareholder_five_ratio, shareholder_six, shareholder_six_ratio @@ -471,6 +537,30 @@ sub_state = #{record.subState,jdbcType=INTEGER}, + + shareholder_third = #{record.shareholderThird,jdbcType=VARCHAR}, + + + shareholder_third_ratio = #{record.shareholderThirdRatio,jdbcType=VARCHAR}, + + + shareholder_fourth = #{record.shareholderFourth,jdbcType=VARCHAR}, + + + shareholder_fourth_ratio = #{record.shareholderFourthRatio,jdbcType=VARCHAR}, + + + shareholder_five = #{record.shareholderFive,jdbcType=VARCHAR}, + + + shareholder_five_ratio = #{record.shareholderFiveRatio,jdbcType=VARCHAR}, + + + shareholder_six = #{record.shareholderSix,jdbcType=VARCHAR}, + + + shareholder_six_ratio = #{record.shareholderSixRatio,jdbcType=VARCHAR}, + @@ -510,7 +600,15 @@ create_time = #{record.createTime,jdbcType=TIMESTAMP}, update_time = #{record.updateTime,jdbcType=TIMESTAMP}, error_number = #{record.errorNumber,jdbcType=INTEGER}, - sub_state = #{record.subState,jdbcType=INTEGER} + sub_state = #{record.subState,jdbcType=INTEGER}, + shareholder_third = #{record.shareholderThird,jdbcType=VARCHAR}, + shareholder_third_ratio = #{record.shareholderThirdRatio,jdbcType=VARCHAR}, + shareholder_fourth = #{record.shareholderFourth,jdbcType=VARCHAR}, + shareholder_fourth_ratio = #{record.shareholderFourthRatio,jdbcType=VARCHAR}, + shareholder_five = #{record.shareholderFive,jdbcType=VARCHAR}, + shareholder_five_ratio = #{record.shareholderFiveRatio,jdbcType=VARCHAR}, + shareholder_six = #{record.shareholderSix,jdbcType=VARCHAR}, + shareholder_six_ratio = #{record.shareholderSixRatio,jdbcType=VARCHAR} @@ -614,6 +712,30 @@ sub_state = #{subState,jdbcType=INTEGER}, + + shareholder_third = #{shareholderThird,jdbcType=VARCHAR}, + + + shareholder_third_ratio = #{shareholderThirdRatio,jdbcType=VARCHAR}, + + + shareholder_fourth = #{shareholderFourth,jdbcType=VARCHAR}, + + + shareholder_fourth_ratio = #{shareholderFourthRatio,jdbcType=VARCHAR}, + + + shareholder_five = #{shareholderFive,jdbcType=VARCHAR}, + + + shareholder_five_ratio = #{shareholderFiveRatio,jdbcType=VARCHAR}, + + + shareholder_six = #{shareholderSix,jdbcType=VARCHAR}, + + + shareholder_six_ratio = #{shareholderSixRatio,jdbcType=VARCHAR}, + where id = #{id,jdbcType=VARCHAR} @@ -650,7 +772,15 @@ create_time = #{createTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP}, error_number = #{errorNumber,jdbcType=INTEGER}, - sub_state = #{subState,jdbcType=INTEGER} + sub_state = #{subState,jdbcType=INTEGER}, + shareholder_third = #{shareholderThird,jdbcType=VARCHAR}, + shareholder_third_ratio = #{shareholderThirdRatio,jdbcType=VARCHAR}, + shareholder_fourth = #{shareholderFourth,jdbcType=VARCHAR}, + shareholder_fourth_ratio = #{shareholderFourthRatio,jdbcType=VARCHAR}, + shareholder_five = #{shareholderFive,jdbcType=VARCHAR}, + shareholder_five_ratio = #{shareholderFiveRatio,jdbcType=VARCHAR}, + shareholder_six = #{shareholderSix,jdbcType=VARCHAR}, + shareholder_six_ratio = #{shareholderSixRatio,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} \ No newline at end of file