forked from integrated_whb/integrated_whb
BUG优化
parent
da3bde1492
commit
a675bb1bfc
|
@ -11,6 +11,7 @@ import com.zcloud.util.DateUtil;
|
||||||
import com.zcloud.util.Jurisdiction;
|
import com.zcloud.util.Jurisdiction;
|
||||||
import com.zcloud.util.Tools;
|
import com.zcloud.util.Tools;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
|
import org.apache.tomcat.util.json.JSONParser;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
@ -18,10 +19,8 @@ import org.springframework.web.bind.annotation.RequestParam;
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
import org.springframework.web.bind.annotation.ResponseBody;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.*;
|
||||||
import java.util.HashMap;
|
import java.util.stream.Collectors;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@Controller
|
@Controller
|
||||||
@RequestMapping("/securitycustomer")
|
@RequestMapping("/securitycustomer")
|
||||||
|
@ -29,6 +28,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController
|
||||||
@Autowired
|
@Autowired
|
||||||
private TrafficSecurityCustomerManagementService customerManagementService;
|
private TrafficSecurityCustomerManagementService customerManagementService;
|
||||||
|
|
||||||
|
|
||||||
//新增
|
//新增
|
||||||
@RequestMapping(value = "/add")
|
@RequestMapping(value = "/add")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
|
@ -48,7 +48,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController
|
||||||
|
|
||||||
customerManagementService.save(pd);
|
customerManagementService.save(pd);
|
||||||
|
|
||||||
if ( pd.getString("contacts") != null && ! pd.getString("contacts").isEmpty()){
|
if (pd.getString("contacts") != null && !pd.getString("contacts").isEmpty()) {
|
||||||
List<PageData> contacts = JSON.parseArray(pd.getString("contacts"), PageData.class);
|
List<PageData> contacts = JSON.parseArray(pd.getString("contacts"), PageData.class);
|
||||||
for (PageData contact : contacts) {
|
for (PageData contact : contacts) {
|
||||||
PageData contactPd = new PageData();
|
PageData contactPd = new PageData();
|
||||||
|
@ -83,20 +83,23 @@ public class TrafficSecurityCustomerManagementController extends BaseController
|
||||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
|
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
|
||||||
page.setPd(pd);
|
page.setPd(pd);
|
||||||
List<PageData> varList = customerManagementService.listForSecurityCustomerManagement(page);
|
List<PageData> varList = customerManagementService.listForSecurityCustomerManagement(page);
|
||||||
|
|
||||||
map.put("varList", varList);
|
map.put("varList", varList);
|
||||||
map.put("page", page);
|
map.put("page", page);
|
||||||
map.put("result", errInfo);
|
map.put("result", errInfo);
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除
|
* 删除
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value="/delete")
|
@RequestMapping(value = "/delete")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public Object delete() throws Exception{
|
public Object delete() throws Exception {
|
||||||
Map<String,String> map = new HashMap<String,String>();
|
Map<String, String> map = new HashMap<String, String>();
|
||||||
String errInfo = "success";
|
String errInfo = "success";
|
||||||
PageData pd = new PageData();
|
PageData pd = new PageData();
|
||||||
pd = this.getPageData();
|
pd = this.getPageData();
|
||||||
|
@ -121,4 +124,66 @@ public class TrafficSecurityCustomerManagementController extends BaseController
|
||||||
map.put("result", errInfo);
|
map.put("result", errInfo);
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@RequestMapping(value = "/getTrafficCustomerSelectView")
|
||||||
|
@ResponseBody
|
||||||
|
public Object getTrafficCustomerSelectView() throws Exception {
|
||||||
|
Map<String, Object> map = new HashMap<String, Object>();
|
||||||
|
String errInfo = "success";
|
||||||
|
PageData pd = new PageData();
|
||||||
|
pd = this.getPageData();
|
||||||
|
pd = customerManagementService.getTrafficCustomerSelectView(pd); //根据ID读取客户管理信息
|
||||||
|
PageData pageData = new PageData();
|
||||||
|
pageData.put("CUSTOMERMANAGEMENT_ID", pd.getString("CUSTOMERMANAGEMENT_ID"));
|
||||||
|
List<PageData> customercontactList = customerManagementService.findByCustomerManagementId(pageData);
|
||||||
|
pd.put("customercontactList", customercontactList);
|
||||||
|
map.put("pd", pd);
|
||||||
|
map.put("result", errInfo);
|
||||||
|
return map;
|
||||||
|
}
|
||||||
|
|
||||||
|
@RequestMapping(value = "/edit")
|
||||||
|
@ResponseBody
|
||||||
|
public Object edit() throws Exception {
|
||||||
|
Map<String, Object> map = new HashMap<String, Object>();
|
||||||
|
String errInfo = "success";
|
||||||
|
PageData pd = this.getPageData();
|
||||||
|
|
||||||
|
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id
|
||||||
|
pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名
|
||||||
|
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
|
||||||
|
// 修改 客户管理表
|
||||||
|
customerManagementService.edit(pd);
|
||||||
|
|
||||||
|
PageData pd2 = new PageData();
|
||||||
|
pd2.put("CUSTOMERMANAGEMENT_ID", pd.getString("CUSTOMERMANAGEMENT_ID"));
|
||||||
|
pd2.put("DELETOR", Jurisdiction.getUSER_ID());
|
||||||
|
pd2.put("DELETORNAME", Jurisdiction.getUsername());
|
||||||
|
pd2.put("DELETETIME", DateUtil.date2Str(new Date()));
|
||||||
|
customerManagementService.deleteContact(pd2);
|
||||||
|
|
||||||
|
if (pd.getString("contacts") != null && !pd.getString("contacts").isEmpty()) {
|
||||||
|
List<PageData> contacts = JSON.parseArray(pd.getString("contacts"), PageData.class);
|
||||||
|
for (PageData contact : contacts) {
|
||||||
|
PageData contactPd = new PageData();
|
||||||
|
contactPd.put("CUSTOMERCONTACT_ID", this.get32UUID());
|
||||||
|
contactPd.put("CONTACT_ID", this.get32UUID());
|
||||||
|
contactPd.put("CUSTOMERADDRESS_ID", this.get32UUID());
|
||||||
|
contactPd.put("CUSTOMERMANAGEMENT_ID", pd.getString("CUSTOMERMANAGEMENT_ID"));
|
||||||
|
contactPd.put("CREATOR", Jurisdiction.getUSER_ID()); // 设置创建人ID
|
||||||
|
contactPd.put("CREATORNAME", Jurisdiction.getName()); // 设置创建人姓名
|
||||||
|
contactPd.put("CREATETIME", DateUtil.date2Str(new Date())); // 设置创建时间
|
||||||
|
contactPd.put("CONTACT", contact.get("CONTACT"));
|
||||||
|
contactPd.put("CONTACTPHONE", contact.get("CONTACTPHONE"));
|
||||||
|
contactPd.put("CUSTOMERADDRESS", contact.get("CUSTOMERADDRESS"));
|
||||||
|
contactPd.put("ISDELETE", "0"); // 设置删除标志
|
||||||
|
|
||||||
|
customerManagementService.saveContact(contactPd);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
map.put("result", errInfo);
|
||||||
|
map.put("pd", pd);
|
||||||
|
return map;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
package com.zcloud.controller.comprehensive;
|
package com.zcloud.controller.comprehensive;
|
||||||
|
|
||||||
|
import cn.hutool.db.sql.SqlBuilder;
|
||||||
|
import com.alibaba.fastjson.JSON;
|
||||||
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.zcloud.controller.base.BaseController;
|
import com.zcloud.controller.base.BaseController;
|
||||||
import com.zcloud.entity.Page;
|
import com.zcloud.entity.Page;
|
||||||
import com.zcloud.entity.PageData;
|
import com.zcloud.entity.PageData;
|
||||||
|
@ -7,6 +10,7 @@ import com.zcloud.service.comprehensive.TrafficSecurityLocationManagementService
|
||||||
import com.zcloud.util.DateUtil;
|
import com.zcloud.util.DateUtil;
|
||||||
import com.zcloud.util.Jurisdiction;
|
import com.zcloud.util.Jurisdiction;
|
||||||
import com.zcloud.util.Tools;
|
import com.zcloud.util.Tools;
|
||||||
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
@ -14,10 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam;
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
import org.springframework.web.bind.annotation.ResponseBody;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.*;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@Controller
|
@Controller
|
||||||
@RequestMapping("/securitylocation")
|
@RequestMapping("/securitylocation")
|
||||||
|
@ -25,6 +26,7 @@ public class TrafficSecurityLocationManagementController extends BaseController
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private TrafficSecurityLocationManagementService locationManagementService;
|
private TrafficSecurityLocationManagementService locationManagementService;
|
||||||
|
|
||||||
//新增
|
//新增
|
||||||
@RequestMapping(value = "/add")
|
@RequestMapping(value = "/add")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
|
@ -32,7 +34,6 @@ public class TrafficSecurityLocationManagementController extends BaseController
|
||||||
Map<String, Object> map = new HashMap<String, Object>();
|
Map<String, Object> map = new HashMap<String, Object>();
|
||||||
String errInfo = "success";
|
String errInfo = "success";
|
||||||
PageData pd = this.getPageData();
|
PageData pd = this.getPageData();
|
||||||
|
|
||||||
String locationmanagement_id = this.get32UUID();
|
String locationmanagement_id = this.get32UUID();
|
||||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业
|
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业
|
||||||
pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id
|
pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id
|
||||||
|
@ -42,7 +43,15 @@ public class TrafficSecurityLocationManagementController extends BaseController
|
||||||
pd.put("ADDRESSDETAILS_ID", this.get32UUID());
|
pd.put("ADDRESSDETAILS_ID", this.get32UUID());
|
||||||
pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
|
pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
|
||||||
pd.put("ISDELETE", "0");
|
pd.put("ISDELETE", "0");
|
||||||
|
String[] addrIds = JSON.parseObject(pd.getString("ADMINISTRATIVEREGIONS_ID"), String[].class);
|
||||||
|
String addressId = "";
|
||||||
|
for (String addrId : addrIds) {
|
||||||
|
addressId = addressId + addrId + ",";
|
||||||
|
}
|
||||||
|
if(addressId.endsWith(",")){
|
||||||
|
addressId = addressId.substring(0,addressId.length() - 1);
|
||||||
|
}
|
||||||
|
pd.put("ADMINISTRATIVEREGIONS_ID", addressId);
|
||||||
locationManagementService.save(pd);
|
locationManagementService.save(pd);
|
||||||
map.put("result", errInfo);
|
map.put("result", errInfo);
|
||||||
map.put("pd", pd);
|
map.put("pd", pd);
|
||||||
|
@ -101,4 +110,40 @@ public class TrafficSecurityLocationManagementController extends BaseController
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//详情
|
||||||
|
@RequestMapping(value="/goEdit")
|
||||||
|
@ResponseBody
|
||||||
|
public Object getTrafficLocationInfo() throws Exception{
|
||||||
|
Map<String,Object> map = new HashMap<String,Object>();
|
||||||
|
String errInfo = "success";
|
||||||
|
PageData pd = new PageData();
|
||||||
|
pd = this.getPageData();
|
||||||
|
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||||
|
pd = locationManagementService.getTrafficLocationInfo(pd); // 根据id读取地点信息
|
||||||
|
map.put("pd", pd);
|
||||||
|
map.put("result", errInfo);
|
||||||
|
return map;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//修改
|
||||||
|
@RequestMapping(value = "/edit")
|
||||||
|
@ResponseBody
|
||||||
|
public Object edit() throws Exception {
|
||||||
|
Map<String, Object> map = new HashMap<String, Object>();
|
||||||
|
String errInfo = "success";
|
||||||
|
PageData pd = this.getPageData();
|
||||||
|
|
||||||
|
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id
|
||||||
|
pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名
|
||||||
|
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
|
||||||
|
|
||||||
|
locationManagementService.edit(pd);
|
||||||
|
|
||||||
|
map.put("result", errInfo);
|
||||||
|
map.put("pd", pd);
|
||||||
|
return map;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -104,10 +104,6 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
|
||||||
pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
|
pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
|
||||||
pd.put("ISDELETE", "0");
|
pd.put("ISDELETE", "0");
|
||||||
|
|
||||||
if("".equals(pd.getString("TRUCKCART")) || "undefinedpd".equals(pd.getString("TRUCKCART")) || StringUtils.isEmpty(pd.getString("TRUCKCART"))) {
|
|
||||||
pd.put("TRUCKCART","");
|
|
||||||
}
|
|
||||||
|
|
||||||
Date shippingDate = DateUtil.fomatDate(pd.getString("SHIPPINGDATE"));
|
Date shippingDate = DateUtil.fomatDate(pd.getString("SHIPPINGDATE"));
|
||||||
if (shippingDate != null && shippingDate.after(new Date())) {
|
if (shippingDate != null && shippingDate.after(new Date())) {
|
||||||
pd.put("WAYBILLSTATUS", "1");
|
pd.put("WAYBILLSTATUS", "1");
|
||||||
|
|
|
@ -3,8 +3,15 @@ package com.zcloud.mapper.datasource.comprehensive;
|
||||||
import com.zcloud.entity.PageData;
|
import com.zcloud.entity.PageData;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface TrafficSecurityCustomerContactMapper {
|
public interface TrafficSecurityCustomerContactMapper {
|
||||||
void saveContact(PageData contactPd);
|
void saveContact(PageData contactPd);
|
||||||
|
|
||||||
|
List<PageData> findByCustomerManagementId(PageData pd);
|
||||||
|
|
||||||
|
void edit(PageData pd);
|
||||||
|
|
||||||
|
void deleteContact(PageData pd2);
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,4 +28,8 @@ public interface TrafficSecurityCustomerManagementMapper {
|
||||||
List<PageData> getTrafficCustomerSelectList(PageData pd);
|
List<PageData> getTrafficCustomerSelectList(PageData pd);
|
||||||
|
|
||||||
List<PageData> getPrincipalContactList(PageData pd);
|
List<PageData> getPrincipalContactList(PageData pd);
|
||||||
|
|
||||||
|
PageData getTrafficCustomerSelectView(PageData pd);
|
||||||
|
|
||||||
|
void edit(PageData pd);
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,4 +25,10 @@ public interface TrafficSecurityLocationManagementMapper {
|
||||||
void delete(PageData pd);
|
void delete(PageData pd);
|
||||||
|
|
||||||
List<PageData> getTrafficLocationSelectList(PageData pd);
|
List<PageData> getTrafficLocationSelectList(PageData pd);
|
||||||
|
|
||||||
|
PageData getTrafficLocationInfo(PageData pd);
|
||||||
|
|
||||||
|
void edit(PageData pd);
|
||||||
|
|
||||||
|
PageData selAddrIdByName(PageData pd);
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,4 +17,14 @@ public interface TrafficSecurityCustomerManagementService {
|
||||||
List<PageData> getTrafficCustomerSelectList(PageData pd) throws Exception;
|
List<PageData> getTrafficCustomerSelectList(PageData pd) throws Exception;
|
||||||
|
|
||||||
List<PageData> getPrincipalContactList(PageData pd);
|
List<PageData> getPrincipalContactList(PageData pd);
|
||||||
|
|
||||||
|
PageData getTrafficCustomerSelectView(PageData pd);
|
||||||
|
|
||||||
|
List<PageData> findByCustomerManagementId(PageData pageData);
|
||||||
|
|
||||||
|
void edit(PageData pd);
|
||||||
|
|
||||||
|
void editContactInfo(PageData contact);
|
||||||
|
|
||||||
|
void deleteContact(PageData pd2);
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,4 +13,10 @@ public interface TrafficSecurityLocationManagementService {
|
||||||
void delete(PageData pd);
|
void delete(PageData pd);
|
||||||
|
|
||||||
List<PageData> getTrafficLocationSelectList(PageData pd) throws Exception;
|
List<PageData> getTrafficLocationSelectList(PageData pd) throws Exception;
|
||||||
|
|
||||||
|
PageData getTrafficLocationInfo(PageData pd);
|
||||||
|
|
||||||
|
void edit(PageData pd);
|
||||||
|
|
||||||
|
PageData selAddrIdByName(PageData addrName);
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,4 +45,29 @@ public class TrafficSecurityCustomerManagementServiceImpl implements TrafficSecu
|
||||||
public List<PageData> getPrincipalContactList(PageData pd) {
|
public List<PageData> getPrincipalContactList(PageData pd) {
|
||||||
return customerManagementMapper.getPrincipalContactList(pd);
|
return customerManagementMapper.getPrincipalContactList(pd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PageData getTrafficCustomerSelectView(PageData pd) {
|
||||||
|
return customerManagementMapper.getTrafficCustomerSelectView(pd);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<PageData> findByCustomerManagementId(PageData pageData) {
|
||||||
|
return customerContactMapper.findByCustomerManagementId(pageData);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void edit(PageData pd) {
|
||||||
|
customerManagementMapper.edit(pd);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void editContactInfo(PageData pd) {
|
||||||
|
customerContactMapper.edit(pd);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deleteContact(PageData pd2) {
|
||||||
|
customerContactMapper.deleteContact(pd2);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,4 +32,20 @@ public class TrafficSecurityLocationManagementServiceImpl implements TrafficSecu
|
||||||
public List<PageData> getTrafficLocationSelectList(PageData pd) throws Exception {
|
public List<PageData> getTrafficLocationSelectList(PageData pd) throws Exception {
|
||||||
return locationManagementMapper.getTrafficLocationSelectList(pd);
|
return locationManagementMapper.getTrafficLocationSelectList(pd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PageData getTrafficLocationInfo(PageData pd) {
|
||||||
|
return locationManagementMapper.getTrafficLocationInfo(pd);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void edit(PageData pd) {
|
||||||
|
locationManagementMapper.edit(pd);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PageData selAddrIdByName(PageData pd) {
|
||||||
|
return locationManagementMapper.selAddrIdByName(pd);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,6 +85,51 @@
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
|
<update id="edit" parameterType="pd">
|
||||||
|
update
|
||||||
|
<include refid="tableName"/> f
|
||||||
|
set
|
||||||
|
f.CUSTOMERCONTACT_ID = #{CUSTOMERCONTACT_ID},
|
||||||
|
f.CUSTOMERMANAGEMENT_ID = #{CUSTOMERMANAGEMENT_ID},
|
||||||
|
f.CONTACT = #{CONTACT},
|
||||||
|
f.CONTACTPHONE = #{CONTACTPHONE},
|
||||||
|
f.CUSTOMERADDRESS = #{CUSTOMERADDRESS},
|
||||||
|
f.ISDELETE = #{ISDELETE},
|
||||||
|
f.DELETOR = #{DELETOR},
|
||||||
|
f.DELETORNAME = #{DELETORNAME},
|
||||||
|
f.DELETETIME = #{DELETETIME},
|
||||||
|
f.CREATOR = #{CREATOR},
|
||||||
|
f.CREATORNAME = #{CREATORNAME},
|
||||||
|
f.CREATETIME = #{CREATETIME},
|
||||||
|
f.OPERATOR = #{OPERATOR},
|
||||||
|
f.OPERATORNAME = #{OPERATORNAME},
|
||||||
|
f.CONTACT_ID = #{CONTACT_ID},
|
||||||
|
f.CUSTOMERADDRESS_ID = #{CUSTOMERADDRESS_ID},
|
||||||
|
f.OPERATTIME = #{OPERATTIME}
|
||||||
|
where
|
||||||
|
f.CUSTOMERCONTACT_ID = #{CUSTOMERCONTACT_ID}
|
||||||
|
</update>
|
||||||
|
|
||||||
|
<delete id="deleteContact">
|
||||||
|
update
|
||||||
|
<include refid="tableName"></include>
|
||||||
|
set
|
||||||
|
ISDELETE = '1',
|
||||||
|
DELETOR = #{DELETOR},
|
||||||
|
DELETETIME = #{DELETETIME}
|
||||||
|
where
|
||||||
|
CUSTOMERMANAGEMENT_ID = #{CUSTOMERMANAGEMENT_ID}
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
<select id="findByCustomerManagementId" resultType="com.zcloud.entity.PageData" parameterType="pd">
|
||||||
|
select
|
||||||
|
<include refid="Field"></include>
|
||||||
|
from
|
||||||
|
<include refid="tableName"></include> f
|
||||||
|
where f.ISDELETE = 0
|
||||||
|
AND f.CUSTOMERMANAGEMENT_ID = #{CUSTOMERMANAGEMENT_ID}
|
||||||
|
ORDER BY f.OPERATTIME asc
|
||||||
|
</select>
|
||||||
|
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
@ -78,6 +78,21 @@
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
|
<update id="edit" parameterType="pd">
|
||||||
|
update
|
||||||
|
<include refid="tableName"/> f
|
||||||
|
set
|
||||||
|
f.CUSTOMERMANAGEMENT_ID = #{CUSTOMERMANAGEMENT_ID},
|
||||||
|
f.CUSTOMERTYPE = #{CUSTOMERTYPE},
|
||||||
|
f.CUSTOMERNAME = #{CUSTOMERNAME},
|
||||||
|
f.DELETETIME = #{DELETETIME},
|
||||||
|
f.OPERATOR = #{OPERATOR},
|
||||||
|
f.OPERATORNAME = #{OPERATORNAME},
|
||||||
|
f.OPERATTIME = #{OPERATTIME}
|
||||||
|
where
|
||||||
|
f.CUSTOMERMANAGEMENT_ID = #{CUSTOMERMANAGEMENT_ID}
|
||||||
|
</update>
|
||||||
|
|
||||||
<!-- 删除-->
|
<!-- 删除-->
|
||||||
<delete id="delete" parameterType="pd">
|
<delete id="delete" parameterType="pd">
|
||||||
update
|
update
|
||||||
|
@ -108,6 +123,8 @@
|
||||||
<if test="pd.CUSTOMERTYPE != null and pd.CUSTOMERTYPE != ''"><!-- 关键词检索-客户类型 -->
|
<if test="pd.CUSTOMERTYPE != null and pd.CUSTOMERTYPE != ''"><!-- 关键词检索-客户类型 -->
|
||||||
and f.CUSTOMERTYPE = #{pd.CUSTOMERTYPE}
|
and f.CUSTOMERTYPE = #{pd.CUSTOMERTYPE}
|
||||||
</if>
|
</if>
|
||||||
|
GROUP BY u.CUSTOMERMANAGEMENT_ID
|
||||||
|
ORDER BY f.OPERATTIME DESC
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!--列表-->
|
<!--列表-->
|
||||||
|
@ -124,7 +141,7 @@
|
||||||
<include refid="tableName"></include> f
|
<include refid="tableName"></include> f
|
||||||
left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID
|
left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID
|
||||||
left join bus_traffic_customer_contact u on f.CUSTOMERMANAGEMENT_ID = u.CUSTOMERMANAGEMENT_ID
|
left join bus_traffic_customer_contact u on f.CUSTOMERMANAGEMENT_ID = u.CUSTOMERMANAGEMENT_ID
|
||||||
where f.ISDELETE = '0' and f.CORPINFO_ID = #{CORPINFO_ID}
|
where f.ISDELETE = '0' and u.ISDELETE = '0' and f.CORPINFO_ID = #{CORPINFO_ID}
|
||||||
<if test="CUSTOMERTYPE != null and CUSTOMERTYPE != ''"><!-- 关键词检索-客户类型 -->
|
<if test="CUSTOMERTYPE != null and CUSTOMERTYPE != ''"><!-- 关键词检索-客户类型 -->
|
||||||
and f.CUSTOMERTYPE = #{CUSTOMERTYPE}
|
and f.CUSTOMERTYPE = #{CUSTOMERTYPE}
|
||||||
</if>
|
</if>
|
||||||
|
@ -140,4 +157,13 @@
|
||||||
btcm.ISDELETE = '0' AND btcm.CORPINFO_ID = #{CORPINFO_ID}
|
btcm.ISDELETE = '0' AND btcm.CORPINFO_ID = #{CORPINFO_ID}
|
||||||
and btcm.CUSTOMERNAME_ID = #{CLIENT_ID}
|
and btcm.CUSTOMERNAME_ID = #{CLIENT_ID}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="getTrafficCustomerSelectView" resultType="com.zcloud.entity.PageData" parameterType="pd">
|
||||||
|
select
|
||||||
|
<include refid="Field"></include>
|
||||||
|
from
|
||||||
|
<include refid="tableName"></include> f
|
||||||
|
where f.ISDELETE = 0
|
||||||
|
AND f.CUSTOMERMANAGEMENT_ID = #{CUSTOMERMANAGEMENT_ID}
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
f.LOCATIONNAME,
|
f.LOCATIONNAME,
|
||||||
f.ADDRESSDETAILS,
|
f.ADDRESSDETAILS,
|
||||||
f.ADMINISTRATIVEREGIONS,
|
f.ADMINISTRATIVEREGIONS,
|
||||||
|
f.ADMINISTRATIVEREGIONS_ID,
|
||||||
f.CORPINFO_ID,
|
f.CORPINFO_ID,
|
||||||
f.ISDELETE,
|
f.ISDELETE,
|
||||||
f.DELETOR,
|
f.DELETOR,
|
||||||
|
@ -41,6 +42,7 @@
|
||||||
LOCATIONNAME,
|
LOCATIONNAME,
|
||||||
ADDRESSDETAILS,
|
ADDRESSDETAILS,
|
||||||
ADMINISTRATIVEREGIONS,
|
ADMINISTRATIVEREGIONS,
|
||||||
|
ADMINISTRATIVEREGIONS_ID,
|
||||||
CORPINFO_ID,
|
CORPINFO_ID,
|
||||||
ISDELETE,
|
ISDELETE,
|
||||||
DELETOR,
|
DELETOR,
|
||||||
|
@ -65,6 +67,7 @@
|
||||||
#{LOCATIONNAME},
|
#{LOCATIONNAME},
|
||||||
#{ADDRESSDETAILS},
|
#{ADDRESSDETAILS},
|
||||||
#{ADMINISTRATIVEREGIONS},
|
#{ADMINISTRATIVEREGIONS},
|
||||||
|
#{ADMINISTRATIVEREGIONS_ID},
|
||||||
#{CORPINFO_ID},
|
#{CORPINFO_ID},
|
||||||
#{ISDELETE},
|
#{ISDELETE},
|
||||||
#{DELETOR},
|
#{DELETOR},
|
||||||
|
@ -94,6 +97,31 @@
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
|
<update id="edit">
|
||||||
|
update
|
||||||
|
<include refid="tableName"/> f
|
||||||
|
set
|
||||||
|
f.LOCATIONMANAGEMENT_ID = #{LOCATIONMANAGEMENT_ID},
|
||||||
|
f.LOCATIONTYPE = #{LOCATIONTYPE},
|
||||||
|
f.LOCATIONNAME = #{LOCATIONNAME},
|
||||||
|
f.ADDRESSDETAILS = #{ADDRESSDETAILS},
|
||||||
|
f.ADMINISTRATIVEREGIONS = #{ADMINISTRATIVEREGIONS},
|
||||||
|
f.ADMINISTRATIVEREGIONS_ID = #{ADMINISTRATIVEREGIONS_ID},
|
||||||
|
f.ISDELETE = #{ISDELETE},
|
||||||
|
f.DELETOR = #{DELETOR},
|
||||||
|
f.DELETORNAME = #{DELETORNAME},
|
||||||
|
f.DELETETIME = #{DELETETIME},
|
||||||
|
f.OPERATOR = #{OPERATOR},
|
||||||
|
f.OPERATORNAME = #{OPERATORNAME},
|
||||||
|
f.OPERATTIME = #{OPERATTIME},
|
||||||
|
f.LONGITUDE = #{LONGITUDE},
|
||||||
|
f.LATITUDE = #{LATITUDE},
|
||||||
|
f.LOCATIONNAME_ID = #{LOCATIONNAME_ID},
|
||||||
|
f.ADDRESSDETAILS_ID = #{ADDRESSDETAILS_ID}
|
||||||
|
where
|
||||||
|
f.LOCATIONMANAGEMENT_ID = #{LOCATIONMANAGEMENT_ID}
|
||||||
|
</update>
|
||||||
|
|
||||||
<!-- 删除-->
|
<!-- 删除-->
|
||||||
<delete id="delete" parameterType="pd">
|
<delete id="delete" parameterType="pd">
|
||||||
update
|
update
|
||||||
|
@ -118,6 +146,7 @@
|
||||||
<if test="pd.LOCATIONTYPE != null and pd.LOCATIONTYPE != ''"><!-- 关键词检索-客户类型 -->
|
<if test="pd.LOCATIONTYPE != null and pd.LOCATIONTYPE != ''"><!-- 关键词检索-客户类型 -->
|
||||||
and f.LOCATIONTYPE = #{pd.LOCATIONTYPE}
|
and f.LOCATIONTYPE = #{pd.LOCATIONTYPE}
|
||||||
</if>
|
</if>
|
||||||
|
ORDER BY f.OPERATTIME DESC
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!--列表-->
|
<!--列表-->
|
||||||
|
@ -133,4 +162,25 @@
|
||||||
and f.LOCATIONTYPE = #{LOCATIONTYPE}
|
and f.LOCATIONTYPE = #{LOCATIONTYPE}
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="getTrafficLocationInfo" resultType="com.zcloud.entity.PageData" parameterType="pd">
|
||||||
|
select
|
||||||
|
<include refid="Field"></include>
|
||||||
|
from
|
||||||
|
<include refid="tableName"></include> f
|
||||||
|
where f.ISDELETE = 0 AND f.CORPINFO_ID = #{CORPINFO_ID}
|
||||||
|
AND f.LOCATIONMANAGEMENT_ID = #{LOCATIONMANAGEMENT_ID}
|
||||||
|
</select>
|
||||||
|
|
||||||
|
|
||||||
|
<select id="selAddrIdByName" resultType="com.zcloud.entity.PageData" parameterType="pd">
|
||||||
|
select
|
||||||
|
f.*
|
||||||
|
from
|
||||||
|
<include refid="dicTableName"></include> f
|
||||||
|
where
|
||||||
|
f.NAME = #{NAME}
|
||||||
|
AND
|
||||||
|
f.PARENT_ID = #{PARENT_ID}
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
@ -233,6 +233,7 @@
|
||||||
f.TRANSPORTVEHICLE LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
f.TRANSPORTVEHICLE LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
|
||||||
)
|
)
|
||||||
</if>
|
</if>
|
||||||
|
ORDER BY f.OPERATTIME DESC
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="pd">
|
<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="pd">
|
||||||
|
|
Loading…
Reference in New Issue