bug 合同

pro-base/src/main/java/com/idea/buildManage/controller/MnpBuildingController.java

@@ -58,9 +58,6 @@ public class MnpBuildingController extends BaseController {
         return result;
     }
 
-    @Autowired
-    private ParkRoomService parkRoomService;
-
 
     @PostMapping(value = "listAll", produces = {"application/json;charset=UTF-8"})
     @ResponseBody

pro-base/src/main/java/com/idea/buildManage/excel/MnpBuildingListener.java

@@ -184,7 +184,7 @@ public class MnpBuildingListener extends AnalysisEventListener<MnpBuildingExcel>
                     }
                     // 没匹配上的情况
                     if(StringUtils.isEmpty(data.getStructure())){
-                        throw new RuntimeException("第" + (i + 3) + "行，入驻类型格式有误");
+                        throw new RuntimeException("结构格式有误");
                     }
                     // 行政区划
                     if (StringUtils.isEmpty(excel.getRegionalismCode())) {

pro-base/src/main/java/com/idea/buildManage/excel/ParkInfoListener.java

@@ -59,6 +59,8 @@ public class ParkInfoListener extends AnalysisEventListener<ParkInfoExcel> {
         List<Map<String, String>> mappingStatus = sysDictService.selectDictList("MAPPING_STATUS");
         // 销售状态
         List<Map<String, String>> saleStatus = sysDictService.selectDictList("SALE_STATUS");
+        // 公司名称
+        List<Map<String, String>> companyNames = sysDictService.selectDictList("COMPANY_NAME");
 
         if(CollectionUtils.isNotEmpty(excelList)){
             ParkInfo data;
@@ -90,32 +92,42 @@ public class ParkInfoListener extends AnalysisEventListener<ParkInfoExcel> {
                         throw new RuntimeException("预销售许可证编号为空");
                     }
                     data.setPreSalesLicenseNumber(excel.getPreSalesLicenseNumber());
-                    // TODO: 2024/9/11 开发公司 
-                    // 楼盘面积测绘状态
-                    if(StringUtils.isEmpty(excel.getAreaStatus())){
-                        throw new RuntimeException("性质为空");
-                    }
-                    for (Map<String, String> stringStringMap : mappingStatus) {
-                        if (stringStringMap.get("label").equals(excel.getAreaStatus())) {
-                            data.setAreaStatus(Integer.valueOf(stringStringMap.get("value")));
+                    // 开发公司
+                    if(StringUtils.isNotEmpty(excel.getCompanyName())){
+                        for (Map<String, String> stringStringMap : companyNames) {
+                            if (stringStringMap.get("label").equals(excel.getCompanyName())) {
+                                data.setCompanyId(stringStringMap.get("value"));
+                            }
+                        }
+                        // 没匹配上的情况
+                        if(data.getAreaStatus() == null){
+                            throw new RuntimeException("性质格式有误");
                         }
                     }
-                    // 没匹配上的情况
-                    if(StringUtils.isEmpty(data.getNature())){
-                        throw new RuntimeException("性质格式有误");
+                    // 楼盘面积测绘状态
+                    if(StringUtils.isNotEmpty(excel.getAreaStatus())){
+                        for (Map<String, String> stringStringMap : mappingStatus) {
+                            if (stringStringMap.get("label").equals(excel.getAreaStatus())) {
+                                data.setAreaStatus(Integer.valueOf(stringStringMap.get("value")));
+                            }
+                        }
+                        // 没匹配上的情况
+                        if(data.getAreaStatus() == null){
+                            throw new RuntimeException("性质格式有误");
+                        }
                     }
+
                     // 楼盘销售状态
-                    if(StringUtils.isEmpty(excel.getSaleStatus())){
-                        throw new RuntimeException("楼盘销售状态为空");
-                    }
-                    for (Map<String, String> stringStringMap : saleStatus) {
-                        if (stringStringMap.get("label").equals(excel.getSaleStatus())) {
-                            data.setSaleStatus(Integer.valueOf(stringStringMap.get("value")));
+                    if(StringUtils.isNotEmpty(excel.getSaleStatus())){
+                        for (Map<String, String> stringStringMap : saleStatus) {
+                            if (stringStringMap.get("label").equals(excel.getSaleStatus())) {
+                                data.setSaleStatus(Integer.valueOf(stringStringMap.get("value")));
+                            }
+                        }
+                        // 没匹配上的情况
+                        if(data.getSaleStatus() == null){
+                            throw new RuntimeException("楼盘销售状态格式有误");
                         }
-                    }
-                    // 没匹配上的情况
-                    if(data.getSaleStatus() == null){
-                        throw new RuntimeException("楼盘销售状态格式有误");
                     }
 
                     String[] IGNORE_ISOLATOR_PROPERTIES = new String[]{"groupName", "nature", "preSalesLicenseNumber", "areaStatus", "saleStatus"};

pro-base/src/main/java/com/idea/customerManagement/controller/ContractManageController.java

@@ -0,0 +1,52 @@
+package com.idea.customerManagement.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.idea.customerManagement.dto.ContractManageDto;
+import com.idea.customerManagement.dto.CustomerManagementDto;
+import com.idea.customerManagement.service.ContractManageService;
+import com.rockstar.common.base.BaseController;
+import com.rockstar.frame.model.extend.DateTrans;
+import com.rockstar.frame.model.extend.TableSplitResult;
+import com.rockstar.frame.model.extend.Tablepar;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequestMapping(value = "ContractManageController")
+@Api(tags = "合同管理")
+public class ContractManageController extends BaseController {
+
+    @Autowired
+    private ContractManageService modelService;
+
+
+
+
+
+
+    /**
+     * 分页
+     * @param tablepar
+     * @param model
+     * @param dt
+     * @return
+     */
+    @PostMapping(value = "list",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object list(Tablepar tablepar, ContractManageDto model, DateTrans dt){
+        PageInfo<ContractManageDto> page= modelService.listByModel(tablepar,model,dt);
+        TableSplitResult<ContractManageDto> result = new TableSplitResult<ContractManageDto>(page.getPageNum(), page.getTotal(), page.getList());
+        return  result;
+    }
+
+
+
+
+
+
+
+}

pro-base/src/main/java/com/idea/customerManagement/controller/CustomerManagementController.java

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.Date;
 
 @Controller
-@RequestMapping(value = "HouseTypeController")
+@RequestMapping(value = "CustomerManagementController")
 @Api(tags = "客户管理")
 public class CustomerManagementController extends BaseController {
 
@@ -86,4 +86,16 @@ public class CustomerManagementController extends BaseController {
     }
 
 
+    /**
+     * 放弃资格
+     * @param record
+     * @return
+     */
+    @PostMapping(value = "giveUp",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult giveUp(CustomerManagementDto record){
+        int result = modelService.giveUp(record);
+        return result(result);
+    }
+
 }

pro-base/src/main/java/com/idea/customerManagement/controller/IntentionalDepositController.java

@@ -0,0 +1,51 @@
+package com.idea.customerManagement.controller;
+
+import com.idea.customerManagement.dto.RoomSelectionInfoDto;
+import com.idea.customerManagement.model.IntentionalDeposit;
+import com.idea.customerManagement.service.IntentionalDepositService;
+import com.rockstar.common.base.BaseController;
+import com.rockstar.common.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequestMapping(value = "IntentionalDepositController")
+@Api(tags = "意向金管理")
+public class IntentionalDepositController extends BaseController {
+
+    @Autowired
+    private IntentionalDepositService modelService;
+
+
+    /**
+     * 获取意向金流水号
+     * @param customerManagementId
+     * @return
+     */
+    @PostMapping(value = "getSerialNumber",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public String getSerialNumber(String customerManagementId) {
+        return modelService.getSerialNumber(customerManagementId);
+    }
+
+
+    /**
+     * 意向金登记
+     * @param model
+     * @return
+     */
+    @PostMapping(value = "add",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult add(IntentionalDeposit model){
+        int result = modelService.add(model);
+        return result(result);
+    }
+
+
+
+
+}

pro-base/src/main/java/com/idea/customerManagement/dto/ContractManageDto.java

@@ -0,0 +1,20 @@
+package com.idea.customerManagement.dto;
+
+import com.idea.customerManagement.model.ContractManage;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class ContractManageDto extends ContractManage {
+
+    private String buyerName;
+
+    private String signingDateFrom;
+
+    private String signingDateTo;
+
+}

pro-base/src/main/java/com/idea/customerManagement/mapper/ContractManageExtendMapper.java

@@ -0,0 +1,15 @@
+package com.idea.customerManagement.mapper;
+
+import com.idea.customerManagement.dto.ContractManageDto;
+import com.idea.customerManagement.model.ContractManage;
+import com.idea.customerManagement.model.ContractManageExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ContractManageExtendMapper {
+
+    List<ContractManageDto> listByModel(ContractManageDto record);
+
+
+}

pro-base/src/main/java/com/idea/customerManagement/model/ContractManage.java

@@ -10,6 +10,8 @@ import java.util.Date;
 public class ContractManage implements Serializable {
     private String id;
 
+    private String customerManagementId;
+
     private String recordNumber;
 
     private String contractNumber;

pro-base/src/main/java/com/idea/customerManagement/model/ContractManageExample.java

@@ -1315,6 +1315,136 @@ public class ContractManageExample {
             addCriterion("maintenance_total_price not between", value1, value2, "maintenanceTotalPrice");
             return (Criteria) this;
         }
+
+        public Criteria andContractStatusIsNull() {
+            addCriterion("contract_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractStatusIsNotNull() {
+            addCriterion("contract_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractStatusEqualTo(Integer value) {
+            addCriterion("contract_status =", value, "contractStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractStatusNotEqualTo(Integer value) {
+            addCriterion("contract_status <>", value, "contractStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractStatusGreaterThan(Integer value) {
+            addCriterion("contract_status >", value, "contractStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("contract_status >=", value, "contractStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractStatusLessThan(Integer value) {
+            addCriterion("contract_status <", value, "contractStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("contract_status <=", value, "contractStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractStatusIn(List<Integer> values) {
+            addCriterion("contract_status in", values, "contractStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractStatusNotIn(List<Integer> values) {
+            addCriterion("contract_status not in", values, "contractStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractStatusBetween(Integer value1, Integer value2) {
+            addCriterion("contract_status between", value1, value2, "contractStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("contract_status not between", value1, value2, "contractStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdIsNull() {
+            addCriterion("customer_management_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdIsNotNull() {
+            addCriterion("customer_management_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdEqualTo(String value) {
+            addCriterion("customer_management_id =", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdNotEqualTo(String value) {
+            addCriterion("customer_management_id <>", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdGreaterThan(String value) {
+            addCriterion("customer_management_id >", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdGreaterThanOrEqualTo(String value) {
+            addCriterion("customer_management_id >=", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdLessThan(String value) {
+            addCriterion("customer_management_id <", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdLessThanOrEqualTo(String value) {
+            addCriterion("customer_management_id <=", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdLike(String value) {
+            addCriterion("customer_management_id like", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdNotLike(String value) {
+            addCriterion("customer_management_id not like", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdIn(List<String> values) {
+            addCriterion("customer_management_id in", values, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdNotIn(List<String> values) {
+            addCriterion("customer_management_id not in", values, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdBetween(String value1, String value2) {
+            addCriterion("customer_management_id between", value1, value2, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdNotBetween(String value1, String value2) {
+            addCriterion("customer_management_id not between", value1, value2, "customerManagementId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

pro-base/src/main/java/com/idea/customerManagement/model/IntentionalDeposit.java

@@ -1,15 +1,16 @@
 package com.idea.customerManagement.model;
 
-import io.swagger.annotations.ApiModel;
-
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
-@ApiModel("意向金")
 public class IntentionalDeposit implements Serializable {
     private String id;
 
+    private String groupId;
+
+    private String discId;
+
     private String customerManagementId;
 
     private BigDecimal receivableMoney;
@@ -20,8 +21,6 @@ public class IntentionalDeposit implements Serializable {
 
     private String serialNumber;
 
-    private String number;
-
     private Date collectionTime;
 
     private String createdId;
@@ -46,6 +45,22 @@ public class IntentionalDeposit implements Serializable {
         this.id = id == null ? null : id.trim();
     }
 
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId == null ? null : groupId.trim();
+    }
+
+    public String getDiscId() {
+        return discId;
+    }
+
+    public void setDiscId(String discId) {
+        this.discId = discId == null ? null : discId.trim();
+    }
+
     public String getCustomerManagementId() {
         return customerManagementId;
     }
@@ -86,14 +101,6 @@ public class IntentionalDeposit implements Serializable {
         this.serialNumber = serialNumber == null ? null : serialNumber.trim();
     }
 
-    public String getNumber() {
-        return number;
-    }
-
-    public void setNumber(String number) {
-        this.number = number == null ? null : number.trim();
-    }
-
     public Date getCollectionTime() {
         return collectionTime;
     }

pro-base/src/main/java/com/idea/customerManagement/model/IntentionalDepositExample.java

@@ -176,6 +176,146 @@ public class IntentionalDepositExample {
             return (Criteria) this;
         }
 
+        public Criteria andGroupIdIsNull() {
+            addCriterion("group_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdIsNotNull() {
+            addCriterion("group_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdEqualTo(String value) {
+            addCriterion("group_id =", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdNotEqualTo(String value) {
+            addCriterion("group_id <>", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdGreaterThan(String value) {
+            addCriterion("group_id >", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdGreaterThanOrEqualTo(String value) {
+            addCriterion("group_id >=", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdLessThan(String value) {
+            addCriterion("group_id <", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdLessThanOrEqualTo(String value) {
+            addCriterion("group_id <=", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdLike(String value) {
+            addCriterion("group_id like", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdNotLike(String value) {
+            addCriterion("group_id not like", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdIn(List<String> values) {
+            addCriterion("group_id in", values, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdNotIn(List<String> values) {
+            addCriterion("group_id not in", values, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdBetween(String value1, String value2) {
+            addCriterion("group_id between", value1, value2, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdNotBetween(String value1, String value2) {
+            addCriterion("group_id not between", value1, value2, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscIdIsNull() {
+            addCriterion("disc_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscIdIsNotNull() {
+            addCriterion("disc_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscIdEqualTo(String value) {
+            addCriterion("disc_id =", value, "discId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscIdNotEqualTo(String value) {
+            addCriterion("disc_id <>", value, "discId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscIdGreaterThan(String value) {
+            addCriterion("disc_id >", value, "discId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscIdGreaterThanOrEqualTo(String value) {
+            addCriterion("disc_id >=", value, "discId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscIdLessThan(String value) {
+            addCriterion("disc_id <", value, "discId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscIdLessThanOrEqualTo(String value) {
+            addCriterion("disc_id <=", value, "discId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscIdLike(String value) {
+            addCriterion("disc_id like", value, "discId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscIdNotLike(String value) {
+            addCriterion("disc_id not like", value, "discId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscIdIn(List<String> values) {
+            addCriterion("disc_id in", values, "discId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscIdNotIn(List<String> values) {
+            addCriterion("disc_id not in", values, "discId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscIdBetween(String value1, String value2) {
+            addCriterion("disc_id between", value1, value2, "discId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscIdNotBetween(String value1, String value2) {
+            addCriterion("disc_id not between", value1, value2, "discId");
+            return (Criteria) this;
+        }
+
         public Criteria andCustomerManagementIdIsNull() {
             addCriterion("customer_management_id is null");
             return (Criteria) this;
@@ -496,76 +636,6 @@ public class IntentionalDepositExample {
             return (Criteria) this;
         }
 
-        public Criteria andNumberIsNull() {
-            addCriterion("number is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andNumberIsNotNull() {
-            addCriterion("number is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andNumberEqualTo(String value) {
-            addCriterion("number =", value, "number");
-            return (Criteria) this;
-        }
-
-        public Criteria andNumberNotEqualTo(String value) {
-            addCriterion("number <>", value, "number");
-            return (Criteria) this;
-        }
-
-        public Criteria andNumberGreaterThan(String value) {
-            addCriterion("number >", value, "number");
-            return (Criteria) this;
-        }
-
-        public Criteria andNumberGreaterThanOrEqualTo(String value) {
-            addCriterion("number >=", value, "number");
-            return (Criteria) this;
-        }
-
-        public Criteria andNumberLessThan(String value) {
-            addCriterion("number <", value, "number");
-            return (Criteria) this;
-        }
-
-        public Criteria andNumberLessThanOrEqualTo(String value) {
-            addCriterion("number <=", value, "number");
-            return (Criteria) this;
-        }
-
-        public Criteria andNumberLike(String value) {
-            addCriterion("number like", value, "number");
-            return (Criteria) this;
-        }
-
-        public Criteria andNumberNotLike(String value) {
-            addCriterion("number not like", value, "number");
-            return (Criteria) this;
-        }
-
-        public Criteria andNumberIn(List<String> values) {
-            addCriterion("number in", values, "number");
-            return (Criteria) this;
-        }
-
-        public Criteria andNumberNotIn(List<String> values) {
-            addCriterion("number not in", values, "number");
-            return (Criteria) this;
-        }
-
-        public Criteria andNumberBetween(String value1, String value2) {
-            addCriterion("number between", value1, value2, "number");
-            return (Criteria) this;
-        }
-
-        public Criteria andNumberNotBetween(String value1, String value2) {
-            addCriterion("number not between", value1, value2, "number");
-            return (Criteria) this;
-        }
-
         public Criteria andCollectionTimeIsNull() {
             addCriterion("collection_time is null");
             return (Criteria) this;

pro-base/src/main/java/com/idea/customerManagement/service/ContractManageService.java

@@ -0,0 +1,96 @@
+package com.idea.customerManagement.service;
+
+import cn.hutool.core.util.IdUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.idea.customerManagement.dto.ContractManageDto;
+import com.idea.customerManagement.dto.CustomerManagementDto;
+import com.idea.customerManagement.mapper.ContractManageExtendMapper;
+import com.idea.customerManagement.mapper.ContractManageMapper;
+import com.idea.customerManagement.model.ContractManage;
+import com.idea.customerManagement.model.ContractManageExample;
+import com.rockstar.common.base.BaseService;
+import com.rockstar.frame.model.extend.DateTrans;
+import com.rockstar.frame.model.extend.Tablepar;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ContractManageService implements BaseService<ContractManage, ContractManageExample> {
+
+    @Autowired
+    private ContractManageMapper modelMapper;
+    @Autowired
+    private ContractManageExtendMapper extendMapper;
+
+
+    @Override
+    public int deleteByPrimaryKey(String s) {
+        return modelMapper.deleteByPrimaryKey(s);
+    }
+
+    @Override
+    public int insertSelective(ContractManage contractManage) {
+        contractManage.setId(IdUtil.simpleUUID());
+        return modelMapper.insertSelective(contractManage);
+    }
+
+    public int insertWithoutId(ContractManage contractManage) {
+        return modelMapper.insertSelective(contractManage);
+    }
+
+    @Override
+    public ContractManage selectByPrimaryKey(String s) {
+        return modelMapper.selectByPrimaryKey(s);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(ContractManage contractManage) {
+        return modelMapper.updateByPrimaryKeySelective(contractManage);
+    }
+
+    @Override
+    public int updateByExampleSelective(ContractManage contractManage, ContractManageExample contractManageExample) {
+        return modelMapper.updateByExampleSelective(contractManage,contractManageExample);
+    }
+
+    @Override
+    public int updateByExample(ContractManage contractManage, ContractManageExample contractManageExample) {
+        return modelMapper.updateByExample(contractManage,contractManageExample);
+    }
+
+    @Override
+    public List<ContractManage> selectByExample(ContractManageExample contractManageExample) {
+        return modelMapper.selectByExample(contractManageExample);
+    }
+
+    @Override
+    public long countByExample(ContractManageExample contractManageExample) {
+        return modelMapper.countByExample(contractManageExample);
+    }
+
+    @Override
+    public int deleteByExample(ContractManageExample contractManageExample) {
+        return modelMapper.deleteByExample(contractManageExample);
+    }
+
+
+    public PageInfo<ContractManageDto> listByModel(Tablepar tablepar, ContractManageDto model, DateTrans dt) {
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+        List<ContractManageDto> list = extendMapper.listByModel(model);
+        PageInfo<ContractManageDto> pageInfo = new PageInfo<>(list);
+        return pageInfo;
+    }
+
+
+    public int addContract(){
+
+        // TODO: 2024/9/18  
+        return 1;
+    }
+
+
+
+}

pro-base/src/main/java/com/idea/customerManagement/service/CustomerManagementService.java

@@ -195,4 +195,16 @@ public class CustomerManagementService implements BaseService<CustomerManagement
         return result;
     }
 
+    /**
+     * 放弃资格
+     * @param model
+     * @return
+     */
+    public int giveUp(CustomerManagement model){
+
+        model.setStatus(6);
+        return updateByPrimaryKeySelective(model);
+    }
+
+
 }

pro-base/src/main/java/com/idea/customerManagement/service/IntentionalDepositService.java

@@ -1,4 +1,128 @@
 package com.idea.customerManagement.service;
 
-public class IntentionalDepositService {
+import cn.hutool.core.util.IdUtil;
+import com.idea.buildManage.mapper.ParkFloorDiscMapper;
+import com.idea.buildManage.mapper.ParkInfoMapper;
+import com.idea.buildManage.model.ParkFloorDisc;
+import com.idea.buildManage.model.ParkInfo;
+import com.idea.buildManage.response.ParkRoomResponse;
+import com.idea.customerManagement.mapper.CustomerManagementMapper;
+import com.idea.customerManagement.mapper.IntentionalDepositMapper;
+import com.idea.customerManagement.model.CustomerManagement;
+import com.idea.customerManagement.model.IntentionalDeposit;
+import com.idea.customerManagement.model.IntentionalDepositExample;
+import com.idea.customerManagement.model.RoomSelectionInfoExample;
+import com.rockstar.common.base.BaseService;
+import com.rockstar.shiro.util.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class IntentionalDepositService implements BaseService<IntentionalDeposit, IntentionalDepositExample> {
+
+    @Autowired
+    private IntentionalDepositMapper modelMapper;
+    @Autowired
+    private CustomerManagementMapper customerManagementMapper;
+    @Autowired
+    private ParkInfoMapper parkInfoMapper;
+    @Autowired
+    private ParkFloorDiscMapper parkFloorDiscMapper;
+
+
+    @Override
+    public int deleteByPrimaryKey(String s) {
+        return modelMapper.deleteByPrimaryKey(s);
+    }
+
+    @Override
+    public int insertSelective(IntentionalDeposit intentionalDeposit) {
+        intentionalDeposit.setId(IdUtil.simpleUUID());
+        return modelMapper.insertSelective(intentionalDeposit);
+    }
+
+    public int insertWithoutId(IntentionalDeposit intentionalDeposit) {
+        return modelMapper.insertSelective(intentionalDeposit);
+    }
+
+    @Override
+    public IntentionalDeposit selectByPrimaryKey(String s) {
+        return modelMapper.selectByPrimaryKey(s);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(IntentionalDeposit intentionalDeposit) {
+        return modelMapper.updateByPrimaryKeySelective(intentionalDeposit);
+    }
+
+    @Override
+    public int updateByExampleSelective(IntentionalDeposit intentionalDeposit, IntentionalDepositExample intentionalDepositExample) {
+        return modelMapper.updateByExampleSelective(intentionalDeposit,intentionalDepositExample);
+    }
+
+    @Override
+    public int updateByExample(IntentionalDeposit intentionalDeposit, IntentionalDepositExample intentionalDepositExample) {
+        return modelMapper.updateByExample(intentionalDeposit,intentionalDepositExample);
+    }
+
+    @Override
+    public List<IntentionalDeposit> selectByExample(IntentionalDepositExample intentionalDepositExample) {
+        return modelMapper.selectByExample(intentionalDepositExample);
+    }
+
+    @Override
+    public long countByExample(IntentionalDepositExample intentionalDepositExample) {
+        return modelMapper.countByExample(intentionalDepositExample);
+    }
+
+    @Override
+    public int deleteByExample(IntentionalDepositExample intentionalDepositExample) {
+        return modelMapper.deleteByExample(intentionalDepositExample);
+    }
+
+    /**
+     * 获取收据流水号（意向金编号）
+     * @param customerManagementId
+     * @return
+     */
+    public String getSerialNumber(String customerManagementId){
+        CustomerManagement customerManagement = customerManagementMapper.selectByPrimaryKey(customerManagementId);
+        String groupId = customerManagement.getGroupId();
+        String discId = customerManagement.getDiscId();
+        // 查找这个小区已收取意向金的 数据量
+        IntentionalDepositExample example = new IntentionalDepositExample();
+        example.createCriteria().andGroupIdEqualTo(groupId);
+        Long count = countByExample(example);
+        String number = "";
+        if(count.doubleValue() == 0){
+            number = "00001";
+        }else {
+            count ++;
+            number = String.format(count.toString(), "%05d", 1);
+        }
+        ParkInfo parkInfo = parkInfoMapper.selectByPrimaryKey(groupId);
+        ParkFloorDisc parkFloorDisc = parkFloorDiscMapper.selectByPrimaryKey(discId);
+        String serialNumber = parkInfo.getGroupName()+ parkFloorDisc.getName() + "YXJ" + number;
+        return serialNumber;
+    }
+
+    /**
+     * 意向金登记
+     * @param model
+     * @return
+     */
+    public int add(IntentionalDeposit model){
+
+        model.setCreatedAt(new Date());
+        model.setCreatedId(ShiroUtils.getUserId());
+        return insertSelective(model);
+    }
+
+
+
+
+
 }

pro-base/src/main/resources/mybatis/buildManage/ParkFloorDiscExtendMapper.xml

@@ -13,8 +13,8 @@
         park_floor_disc d
         LEFT JOIN park_info i ON d.group_id = i.id
         <where>
-            <if test="name != null and name != ''">
-                and d.name = #{name}
+            <if test="groupName != null and groupName != ''">
+                and i.group_name like concat('%',#{groupName},'%')
             </if>
             <if test="level == 1">
                 and i.id = #{nodeId}
@@ -30,6 +30,7 @@
         *
         from park_floor_disc
         where group_id = #{id,jdbcType=VARCHAR}
+        order by name asc
     </select>
 
     <insert id="insertBatch">

pro-base/src/main/resources/mybatis/customerManagement/ContractManageExtendMapper.xml

@@ -0,0 +1,25 @@
+<?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.idea.customerManagement.mapper.ContractManageExtendMapper">
+
+    <select id="listByModel" resultType="com.idea.customerManagement.dto.ContractManageDto">
+        select * from contract_manage
+        <where>
+            <if test="houseName != null and houseName != ''">
+                and house_name like concat('%',#{houseName},'%')
+            </if>
+            <if test="contractStatus != null and contractStatus != ''">
+                and contract_status = #{contractStatus}
+            </if>
+            <if test="signingDateFrom != null and signingDateFrom != ''">
+                and signing_date &lt;= #{signingDateFrom}
+            </if>
+            <if test="signingDateTo != null and signingDateTo != ''">
+                and signing_date >= #{signingDateTo}
+            </if>
+            <if test="buyerName != null and buyerName != ''">
+                and customer_management_id in (select customer_management_id from buyer where name like concat('%',#{buyerName},'%'))
+            </if>
+        </where>
+    </select>
+</mapper>

pro-base/src/main/resources/mybatis/customerManagement/ContractManageMapper.xml

@@ -21,6 +21,8 @@
     <result column="deadline" jdbcType="TIMESTAMP" property="deadline" />
     <result column="maintenance_funds" jdbcType="DECIMAL" property="maintenanceFunds" />
     <result column="maintenance_total_price" jdbcType="DECIMAL" property="maintenanceTotalPrice" />
+    <result column="contract_status" jdbcType="INTEGER" property="contractStatus" />
+    <result column="customer_management_id" jdbcType="VARCHAR" property="customerManagementId" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.customerManagement.model.ContractManage">
     <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
@@ -89,7 +91,7 @@
     id, record_number, contract_number, seller, house_id, house_name, actual_build_area, 
     actual_internal_area, actual_share_area, institution, signing_date, house_price, 
     total_price, buyer_proportion, buyer_money, payment_method, deadline, maintenance_funds, 
-    maintenance_total_price
+    maintenance_total_price, contract_status, customer_management_id
   </sql>
   <sql id="Blob_Column_List">
     remark, contract_original, contract_other
@@ -149,7 +151,8 @@
       institution, signing_date, house_price, 
       total_price, buyer_proportion, buyer_money, 
       payment_method, deadline, maintenance_funds, 
-      maintenance_total_price, remark, contract_original, 
+      maintenance_total_price, contract_status, 
+      customer_management_id, remark, contract_original, 
       contract_other)
     values (#{id,jdbcType=VARCHAR}, #{recordNumber,jdbcType=VARCHAR}, #{contractNumber,jdbcType=VARCHAR}, 
       #{seller,jdbcType=VARCHAR}, #{houseId,jdbcType=VARCHAR}, #{houseName,jdbcType=VARCHAR}, 
@@ -157,7 +160,8 @@
       #{institution,jdbcType=VARCHAR}, #{signingDate,jdbcType=TIMESTAMP}, #{housePrice,jdbcType=DECIMAL}, 
       #{totalPrice,jdbcType=DECIMAL}, #{buyerProportion,jdbcType=DOUBLE}, #{buyerMoney,jdbcType=DECIMAL}, 
       #{paymentMethod,jdbcType=INTEGER}, #{deadline,jdbcType=TIMESTAMP}, #{maintenanceFunds,jdbcType=DECIMAL}, 
-      #{maintenanceTotalPrice,jdbcType=DECIMAL}, #{remark,jdbcType=LONGVARCHAR}, #{contractOriginal,jdbcType=LONGVARCHAR}, 
+      #{maintenanceTotalPrice,jdbcType=DECIMAL}, #{contractStatus,jdbcType=INTEGER}, 
+      #{customerManagementId,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR}, #{contractOriginal,jdbcType=LONGVARCHAR}, 
       #{contractOther,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.idea.customerManagement.model.ContractManage">
@@ -220,6 +224,12 @@
       <if test="maintenanceTotalPrice != null">
         maintenance_total_price,
       </if>
+      <if test="contractStatus != null">
+        contract_status,
+      </if>
+      <if test="customerManagementId != null">
+        customer_management_id,
+      </if>
       <if test="remark != null">
         remark,
       </if>
@@ -288,6 +298,12 @@
       <if test="maintenanceTotalPrice != null">
         #{maintenanceTotalPrice,jdbcType=DECIMAL},
       </if>
+      <if test="contractStatus != null">
+        #{contractStatus,jdbcType=INTEGER},
+      </if>
+      <if test="customerManagementId != null">
+        #{customerManagementId,jdbcType=VARCHAR},
+      </if>
       <if test="remark != null">
         #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -365,6 +381,12 @@
       <if test="record.maintenanceTotalPrice != null">
         maintenance_total_price = #{record.maintenanceTotalPrice,jdbcType=DECIMAL},
       </if>
+      <if test="record.contractStatus != null">
+        contract_status = #{record.contractStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.customerManagementId != null">
+        customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
+      </if>
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=LONGVARCHAR},
       </if>
@@ -400,6 +422,8 @@
       deadline = #{record.deadline,jdbcType=TIMESTAMP},
       maintenance_funds = #{record.maintenanceFunds,jdbcType=DECIMAL},
       maintenance_total_price = #{record.maintenanceTotalPrice,jdbcType=DECIMAL},
+      contract_status = #{record.contractStatus,jdbcType=INTEGER},
+      customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
       remark = #{record.remark,jdbcType=LONGVARCHAR},
       contract_original = #{record.contractOriginal,jdbcType=LONGVARCHAR},
       contract_other = #{record.contractOther,jdbcType=LONGVARCHAR}
@@ -427,7 +451,9 @@
       payment_method = #{record.paymentMethod,jdbcType=INTEGER},
       deadline = #{record.deadline,jdbcType=TIMESTAMP},
       maintenance_funds = #{record.maintenanceFunds,jdbcType=DECIMAL},
-      maintenance_total_price = #{record.maintenanceTotalPrice,jdbcType=DECIMAL}
+      maintenance_total_price = #{record.maintenanceTotalPrice,jdbcType=DECIMAL},
+      contract_status = #{record.contractStatus,jdbcType=INTEGER},
+      customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -489,6 +515,12 @@
       <if test="maintenanceTotalPrice != null">
         maintenance_total_price = #{maintenanceTotalPrice,jdbcType=DECIMAL},
       </if>
+      <if test="contractStatus != null">
+        contract_status = #{contractStatus,jdbcType=INTEGER},
+      </if>
+      <if test="customerManagementId != null">
+        customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
+      </if>
       <if test="remark != null">
         remark = #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -521,6 +553,8 @@
       deadline = #{deadline,jdbcType=TIMESTAMP},
       maintenance_funds = #{maintenanceFunds,jdbcType=DECIMAL},
       maintenance_total_price = #{maintenanceTotalPrice,jdbcType=DECIMAL},
+      contract_status = #{contractStatus,jdbcType=INTEGER},
+      customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=LONGVARCHAR},
       contract_original = #{contractOriginal,jdbcType=LONGVARCHAR},
       contract_other = #{contractOther,jdbcType=LONGVARCHAR}
@@ -545,7 +579,9 @@
       payment_method = #{paymentMethod,jdbcType=INTEGER},
       deadline = #{deadline,jdbcType=TIMESTAMP},
       maintenance_funds = #{maintenanceFunds,jdbcType=DECIMAL},
-      maintenance_total_price = #{maintenanceTotalPrice,jdbcType=DECIMAL}
+      maintenance_total_price = #{maintenanceTotalPrice,jdbcType=DECIMAL},
+      contract_status = #{contractStatus,jdbcType=INTEGER},
+      customer_management_id = #{customerManagementId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

pro-base/src/main/resources/mybatis/customerManagement/IntentionalDepositMapper.xml

@@ -3,12 +3,13 @@
 <mapper namespace="com.idea.customerManagement.mapper.IntentionalDepositMapper">
   <resultMap id="BaseResultMap" type="com.idea.customerManagement.model.IntentionalDeposit">
     <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="group_id" jdbcType="VARCHAR" property="groupId" />
+    <result column="disc_id" jdbcType="VARCHAR" property="discId" />
     <result column="customer_management_id" jdbcType="VARCHAR" property="customerManagementId" />
     <result column="receivable_money" jdbcType="DECIMAL" property="receivableMoney" />
     <result column="received_amount" jdbcType="DECIMAL" property="receivedAmount" />
     <result column="payment_method" jdbcType="INTEGER" property="paymentMethod" />
     <result column="serial_number" jdbcType="VARCHAR" property="serialNumber" />
-    <result column="number" jdbcType="VARCHAR" property="number" />
     <result column="collection_time" jdbcType="TIMESTAMP" property="collectionTime" />
     <result column="created_id" jdbcType="VARCHAR" property="createdId" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
@@ -78,8 +79,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, customer_management_id, receivable_money, received_amount, payment_method, serial_number, 
-    number, collection_time, created_id, created_at, updated_at, updated_id
+    id, group_id, disc_id, customer_management_id, receivable_money, received_amount, 
+    payment_method, serial_number, collection_time, created_id, created_at, updated_at, 
+    updated_id
   </sql>
   <sql id="Blob_Column_List">
     remark, file_list
@@ -133,16 +135,18 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.idea.customerManagement.model.IntentionalDeposit">
-    insert into intentional_deposit (id, customer_management_id, receivable_money, 
+    insert into intentional_deposit (id, group_id, disc_id, 
+      customer_management_id, receivable_money, 
       received_amount, payment_method, serial_number, 
-      number, collection_time, created_id, 
-      created_at, updated_at, updated_id, 
-      remark, file_list)
-    values (#{id,jdbcType=VARCHAR}, #{customerManagementId,jdbcType=VARCHAR}, #{receivableMoney,jdbcType=DECIMAL}, 
+      collection_time, created_id, created_at, 
+      updated_at, updated_id, remark, 
+      file_list)
+    values (#{id,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, #{discId,jdbcType=VARCHAR}, 
+      #{customerManagementId,jdbcType=VARCHAR}, #{receivableMoney,jdbcType=DECIMAL}, 
       #{receivedAmount,jdbcType=DECIMAL}, #{paymentMethod,jdbcType=INTEGER}, #{serialNumber,jdbcType=VARCHAR}, 
-      #{number,jdbcType=VARCHAR}, #{collectionTime,jdbcType=TIMESTAMP}, #{createdId,jdbcType=VARCHAR}, 
-      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR}, 
-      #{remark,jdbcType=LONGVARCHAR}, #{fileList,jdbcType=LONGVARCHAR})
+      #{collectionTime,jdbcType=TIMESTAMP}, #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR}, 
+      #{fileList,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.idea.customerManagement.model.IntentionalDeposit">
     insert into intentional_deposit
@@ -150,6 +154,12 @@
       <if test="id != null">
         id,
       </if>
+      <if test="groupId != null">
+        group_id,
+      </if>
+      <if test="discId != null">
+        disc_id,
+      </if>
       <if test="customerManagementId != null">
         customer_management_id,
       </if>
@@ -165,9 +175,6 @@
       <if test="serialNumber != null">
         serial_number,
       </if>
-      <if test="number != null">
-        number,
-      </if>
       <if test="collectionTime != null">
         collection_time,
       </if>
@@ -194,6 +201,12 @@
       <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
+      <if test="groupId != null">
+        #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="discId != null">
+        #{discId,jdbcType=VARCHAR},
+      </if>
       <if test="customerManagementId != null">
         #{customerManagementId,jdbcType=VARCHAR},
       </if>
@@ -209,9 +222,6 @@
       <if test="serialNumber != null">
         #{serialNumber,jdbcType=VARCHAR},
       </if>
-      <if test="number != null">
-        #{number,jdbcType=VARCHAR},
-      </if>
       <if test="collectionTime != null">
         #{collectionTime,jdbcType=TIMESTAMP},
       </if>
@@ -247,6 +257,12 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
       </if>
+      <if test="record.groupId != null">
+        group_id = #{record.groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.discId != null">
+        disc_id = #{record.discId,jdbcType=VARCHAR},
+      </if>
       <if test="record.customerManagementId != null">
         customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
       </if>
@@ -262,9 +278,6 @@
       <if test="record.serialNumber != null">
         serial_number = #{record.serialNumber,jdbcType=VARCHAR},
       </if>
-      <if test="record.number != null">
-        number = #{record.number,jdbcType=VARCHAR},
-      </if>
       <if test="record.collectionTime != null">
         collection_time = #{record.collectionTime,jdbcType=TIMESTAMP},
       </if>
@@ -294,12 +307,13 @@
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update intentional_deposit
     set id = #{record.id,jdbcType=VARCHAR},
+      group_id = #{record.groupId,jdbcType=VARCHAR},
+      disc_id = #{record.discId,jdbcType=VARCHAR},
       customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
       receivable_money = #{record.receivableMoney,jdbcType=DECIMAL},
       received_amount = #{record.receivedAmount,jdbcType=DECIMAL},
       payment_method = #{record.paymentMethod,jdbcType=INTEGER},
       serial_number = #{record.serialNumber,jdbcType=VARCHAR},
-      number = #{record.number,jdbcType=VARCHAR},
       collection_time = #{record.collectionTime,jdbcType=TIMESTAMP},
       created_id = #{record.createdId,jdbcType=VARCHAR},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
@@ -314,12 +328,13 @@
   <update id="updateByExample" parameterType="map">
     update intentional_deposit
     set id = #{record.id,jdbcType=VARCHAR},
+      group_id = #{record.groupId,jdbcType=VARCHAR},
+      disc_id = #{record.discId,jdbcType=VARCHAR},
       customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
       receivable_money = #{record.receivableMoney,jdbcType=DECIMAL},
       received_amount = #{record.receivedAmount,jdbcType=DECIMAL},
       payment_method = #{record.paymentMethod,jdbcType=INTEGER},
       serial_number = #{record.serialNumber,jdbcType=VARCHAR},
-      number = #{record.number,jdbcType=VARCHAR},
       collection_time = #{record.collectionTime,jdbcType=TIMESTAMP},
       created_id = #{record.createdId,jdbcType=VARCHAR},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
@@ -332,6 +347,12 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.idea.customerManagement.model.IntentionalDeposit">
     update intentional_deposit
     <set>
+      <if test="groupId != null">
+        group_id = #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="discId != null">
+        disc_id = #{discId,jdbcType=VARCHAR},
+      </if>
       <if test="customerManagementId != null">
         customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
       </if>
@@ -347,9 +368,6 @@
       <if test="serialNumber != null">
         serial_number = #{serialNumber,jdbcType=VARCHAR},
       </if>
-      <if test="number != null">
-        number = #{number,jdbcType=VARCHAR},
-      </if>
       <if test="collectionTime != null">
         collection_time = #{collectionTime,jdbcType=TIMESTAMP},
       </if>
@@ -376,12 +394,13 @@
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.idea.customerManagement.model.IntentionalDeposit">
     update intentional_deposit
-    set customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
+    set group_id = #{groupId,jdbcType=VARCHAR},
+      disc_id = #{discId,jdbcType=VARCHAR},
+      customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
       receivable_money = #{receivableMoney,jdbcType=DECIMAL},
       received_amount = #{receivedAmount,jdbcType=DECIMAL},
       payment_method = #{paymentMethod,jdbcType=INTEGER},
       serial_number = #{serialNumber,jdbcType=VARCHAR},
-      number = #{number,jdbcType=VARCHAR},
       collection_time = #{collectionTime,jdbcType=TIMESTAMP},
       created_id = #{createdId,jdbcType=VARCHAR},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
@@ -393,12 +412,13 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.idea.customerManagement.model.IntentionalDeposit">
     update intentional_deposit
-    set customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
+    set group_id = #{groupId,jdbcType=VARCHAR},
+      disc_id = #{discId,jdbcType=VARCHAR},
+      customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
       receivable_money = #{receivableMoney,jdbcType=DECIMAL},
       received_amount = #{receivedAmount,jdbcType=DECIMAL},
       payment_method = #{paymentMethod,jdbcType=INTEGER},
       serial_number = #{serialNumber,jdbcType=VARCHAR},
-      number = #{number,jdbcType=VARCHAR},
       collection_time = #{collectionTime,jdbcType=TIMESTAMP},
       created_id = #{createdId,jdbcType=VARCHAR},
       created_at = #{createdAt,jdbcType=TIMESTAMP},

pro-wx/src/main/java/com/idea/pro/wx/web/WxAuthController.java

@@ -5,8 +5,10 @@ import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import com.rockstar.biz.model.BizMain;
 import com.rockstar.biz.model.BizUser;
 import com.rockstar.biz.service.BizMainService;
+import com.rockstar.common.domain.AjaxResult;
 import com.rockstar.frame.mapper.extend.BizMainDao;
 import com.rockstar.frame.model.FrameUser;
+import com.rockstar.frame.service.FrameUserService;
 import com.rockstar.h5.service.FrameWxService;
 import com.rockstar.user.model.UserAccount;
 import com.rockstar.user.model.UserMain;
@@ -23,6 +25,9 @@ import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.cache.CacheManager;
+import org.apache.shiro.mgt.RealmSecurityManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
@@ -63,6 +68,9 @@ public class WxAuthController extends BaseWxController {
     @Autowired
     private FrameWxService frameWxService;
 
+    @Autowired
+    private FrameUserService frameUserService;
+
 
     /**
      * 微信登录
@@ -244,4 +252,22 @@ public class WxAuthController extends BaseWxController {
     public Object getToken(@RequestBody String body, HttpServletRequest request) {
         return gotToken(body, this.sign, request);
     }
+
+    @RequestMapping(value="/adminUnlock", method= RequestMethod.POST,produces = {MediaType.APPLICATION_JSON_VALUE})
+    @ResponseBody
+    public AjaxResult adminUnlock() {
+        FrameUser user = frameUserService.selectByPrimaryKey("1");
+        if (null != user && Constant.TRUE.equals(user.getIsLock())) {
+            user.setIsLock(Constant.FALSE);
+            RealmSecurityManager rsm = (RealmSecurityManager) SecurityUtils.getSecurityManager();
+            CacheManager cache = rsm.getCacheManager();
+            if (null != cache.getCache("passwordRetryCache")) {
+                cache.getCache("passwordRetryCache").remove(user.getUsername());
+            }
+            frameUserService.updateByPrimaryKeySelective(user);
+        }
+        return AjaxResult.success();
+    }
+
+
 }