Browse Source

合同登记

赵芳群 2 years ago
parent
commit
79bb6a36c1

+ 3 - 1
src/main/java/com/jeeplus/modules/workclientinfo/dao/WorkClientInfoDao.java

@@ -29,7 +29,7 @@ public interface WorkClientInfoDao extends CrudDao<WorkClientInfo> {
 
     int countByUscCode(String uscCode);
     Integer queryCount(WorkClientInfo workClientInfo);
-
+    //查询客户
     List<WorkClientInfo> findAll(WorkClientInfo workClientInfo);
     int queryAllCount(WorkClientInfo workClientInfo);
 
@@ -60,4 +60,6 @@ public interface WorkClientInfoDao extends CrudDao<WorkClientInfo> {
      * @return
      */
     WorkClientInfo getByName(String name);
+
+
 }

+ 1 - 0
src/main/java/com/jeeplus/modules/workclientinfo/dao/WorkClientLinkmanDao.java

@@ -54,4 +54,5 @@ public interface WorkClientLinkmanDao extends CrudDao<WorkClientLinkman> {
     void jobTypeDelete(String workClientId);
     //根据客户信息表id查出来对应的联系人信息
     List<WorkClientLinkman> getLinkMan(WorkClientLinkman workClientLinkman);
+
 }

+ 4 - 1
src/main/java/com/jeeplus/modules/workclientinfo/service/WorkClientInfoService.java

@@ -191,6 +191,7 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
         return workattachmentService.getAttachmentList(workClientAttachment);
     }
 
+
     /**
      * 获取一个客户信息
      * @param page 分页对象
@@ -389,7 +390,7 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
      * @param workClientInfo
      */
 	@Transactional(readOnly = false)
-	public void save(WorkClientInfo workClientInfo) {
+	public void save(WorkClientInfo workClientInfo,WorkContractInfo workContractInfo) {
 	    //判定是否为修改类型
 	    boolean flag = false;
 	    if(StringUtils.isNotBlank(workClientInfo.getId())){
@@ -437,6 +438,8 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
                 workClientLinkman.setClientId(workClientInfo);
 				if (StringUtils.isBlank(workClientLinkman.getId())){
 					workClientLinkman.preInsert();
+//					WorkClientLinkman wl = new WorkClientLinkman();
+//					wl.setContractId(workClientInfo.getId());
 					workClientLinkmanDao.insert(workClientLinkman);
 				}else{
 					workClientLinkman.preUpdate();

+ 1 - 0
src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -123,6 +123,7 @@ public class WorkContractInfoController extends BaseController {
     private WorkProjectNotifyService workProjectNotifyService;
     @Autowired
     private WorkContractRecordService workContractRecordService;
+    @Autowired
 
     @ModelAttribute
     public WorkContractInfo get(@RequestParam(required = false) String id) {

+ 1 - 0
src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractReportController.java

@@ -33,6 +33,7 @@ public class WorkContractReportController extends BaseController {
     @Autowired
     private WorkContractReportService workContractReportService;
 
+
     /**
      * 合同管理列表页面
      */

+ 4 - 0
src/main/resources/mappings/modules/workclientinfo/WorkClientLinkmanDao.xml

@@ -370,4 +370,8 @@
 
 
 	</select>
+	<delete id="deleteLinkman">
+delete  from work_client_linkman
+where id= #{id}
+	</delete>
 </mapper>