From 1d95fca62de153888b0ffa5458e3d008a424c587 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期日, 18 九月 2022 19:08:56 +0800 Subject: [PATCH] # --- src/main/java/com/zy/crm/manager/controller/CstmrController.java | 42 ++++++++++++++++++++- src/main/java/com/zy/crm/manager/mapper/CstmrTypeMapper.java | 3 + src/main/java/com/zy/crm/manager/service/impl/CstmrTypeServiceImpl.java | 4 ++ src/main/resources/mapper/CstmrTypeMapper.xml | 10 +++++ src/main/java/com/zy/crm/manager/service/CstmrTypeService.java | 2 + src/main/webapp/mould/甲方单位导入模板.xls | 0 6 files changed, 59 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java index f86f7a7..26c6060 100644 --- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java +++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java @@ -12,7 +12,9 @@ import com.core.exception.CoolException; import com.zy.crm.common.web.BaseController; import com.zy.crm.manager.entity.Cstmr; +import com.zy.crm.manager.entity.CstmrType; import com.zy.crm.manager.service.CstmrService; +import com.zy.crm.manager.service.CstmrTypeService; import lombok.extern.slf4j.Slf4j; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Row; @@ -35,6 +37,8 @@ @Autowired private CstmrService cstmrService; + @Autowired + private CstmrTypeService cstmrTypeService; @RequestMapping(value = "/cstmr/{id}/auth") @ManagerAuth @@ -195,9 +199,43 @@ Date now = new Date(); for (int i = 2; i < totalRows; i++) { Cstmr cstmr = new Cstmr(); - Row row = sheet.getRow(i); - System.out.println(row.getCell(0).getStringCellValue()); + // 瀹㈡埛浠e彿 + String uuid = row.getCell(0).getStringCellValue(); + if (!Cools.isEmpty(uuid)) { + if (cstmrService.selectByUuid(hostId, uuid) != null) { + throw new CoolException(uuid + "瀹㈡埛浠e彿宸插瓨鍦紝璇烽噸鏂板鍏�"); + } else { + cstmr.setUuid(uuid); + } + } else { + cstmr.setUuid(cstmrService.getUuid(hostId)); + } + // 瀹㈡埛浠e彿 + String name = row.getCell(1).getStringCellValue(); + if (Cools.isEmpty(name)) { + throw new CoolException("绗�" + i + "琛屽鎴峰悕绉颁笉鑳戒负绌猴紝璇烽噸鏂板鍏�"); + } + cstmr.setName(name); + // 瀹㈡埛绫诲埆 + String type = row.getCell(2).getStringCellValue(); + if (Cools.isEmpty(type)) { + throw new CoolException("绗�" + i + "琛屽鎴风被鍒笉鑳戒负绌猴紝璇烽噸鏂板鍏�"); + } + CstmrType cstmrType = cstmrTypeService.selectByName(hostId, type); + if (null == cstmrType) { + throw new CoolException("绗�" + i + "琛屽鎴风被鍒笉鍚堟硶锛岃閲嶆柊瀵煎叆"); + } + cstmr.setCstmrType(cstmrType.getId()); + // 瀹㈡埛绫诲埆 + cstmr.setRela(row.getCell(3).getStringCellValue()); + // 鐢佃瘽 + cstmr.setTel(row.getCell(4).getStringCellValue()); + // 瀹㈡埛鑱旂郴浜� + cstmr.setContacts(row.getCell(5).getStringCellValue()); + // 澶囨敞 + cstmr.setRemarks(row.getCell(6).getStringCellValue()); + cstmr.setHostId(hostId); cstmr.setDeptId(deptId); diff --git a/src/main/java/com/zy/crm/manager/mapper/CstmrTypeMapper.java b/src/main/java/com/zy/crm/manager/mapper/CstmrTypeMapper.java index a49dc92..249368c 100644 --- a/src/main/java/com/zy/crm/manager/mapper/CstmrTypeMapper.java +++ b/src/main/java/com/zy/crm/manager/mapper/CstmrTypeMapper.java @@ -3,10 +3,13 @@ import com.zy.crm.manager.entity.CstmrType; import com.baomidou.mybatisplus.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @Mapper @Repository public interface CstmrTypeMapper extends BaseMapper<CstmrType> { + CstmrType selectByName(@Param("hostId") Long hostId, @Param("name") String name); + } diff --git a/src/main/java/com/zy/crm/manager/service/CstmrTypeService.java b/src/main/java/com/zy/crm/manager/service/CstmrTypeService.java index 2ad8be1..1a8a922 100644 --- a/src/main/java/com/zy/crm/manager/service/CstmrTypeService.java +++ b/src/main/java/com/zy/crm/manager/service/CstmrTypeService.java @@ -5,4 +5,6 @@ public interface CstmrTypeService extends IService<CstmrType> { + CstmrType selectByName(Long hostId, String name); + } diff --git a/src/main/java/com/zy/crm/manager/service/impl/CstmrTypeServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/CstmrTypeServiceImpl.java index 5b63fb0..f971727 100644 --- a/src/main/java/com/zy/crm/manager/service/impl/CstmrTypeServiceImpl.java +++ b/src/main/java/com/zy/crm/manager/service/impl/CstmrTypeServiceImpl.java @@ -9,4 +9,8 @@ @Service("cstmrTypeService") public class CstmrTypeServiceImpl extends ServiceImpl<CstmrTypeMapper, CstmrType> implements CstmrTypeService { + @Override + public CstmrType selectByName(Long hostId, String name) { + return this.baseMapper.selectByName(hostId, name); + } } diff --git a/src/main/resources/mapper/CstmrTypeMapper.xml b/src/main/resources/mapper/CstmrTypeMapper.xml index 7f7565f..5b5967f 100644 --- a/src/main/resources/mapper/CstmrTypeMapper.xml +++ b/src/main/resources/mapper/CstmrTypeMapper.xml @@ -18,4 +18,14 @@ </resultMap> + <select id="selectByName" resultMap="BaseResultMap"> + select top 1 * + from man_cstmr_type + where 1=1 + and name = #{name} + <if test="hostId != null"> + and host_id = #{hostId} + </if> + </select> + </mapper> diff --git "a/src/main/webapp/mould/\347\224\262\346\226\271\345\215\225\344\275\215\345\257\274\345\205\245\346\250\241\346\235\277.xls" "b/src/main/webapp/mould/\347\224\262\346\226\271\345\215\225\344\275\215\345\257\274\345\205\245\346\250\241\346\235\277.xls" index 66fe862..46d1061 100644 --- "a/src/main/webapp/mould/\347\224\262\346\226\271\345\215\225\344\275\215\345\257\274\345\205\245\346\250\241\346\235\277.xls" +++ "b/src/main/webapp/mould/\347\224\262\346\226\271\345\215\225\344\275\215\345\257\274\345\205\245\346\250\241\346\235\277.xls" Binary files differ -- Gitblit v1.9.1