|
|
@@ -18,6 +18,7 @@ import com.jeeplus.common.utils.TicketQueryUtils;
|
|
|
import com.jeeplus.common.utils.excel.ExportExcel;
|
|
|
import com.jeeplus.common.utils.excel.ImportExcel;
|
|
|
import com.jeeplus.common.web.BaseController;
|
|
|
+import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
|
|
|
import com.jeeplus.modules.sys.entity.MainDictDetail;
|
|
|
import com.jeeplus.modules.sys.utils.DictUtils;
|
|
|
import com.jeeplus.modules.sys.utils.UserUtils;
|
|
|
@@ -108,14 +109,98 @@ public class WorkClientInfoController extends BaseController {
|
|
|
return "modules/workclientinfo/workClientInfoForm";
|
|
|
}
|
|
|
|
|
|
- //二次进行增加联系人类型
|
|
|
+ /**
|
|
|
+ * 查看，增加，编辑客户管理表单页面
|
|
|
+ */
|
|
|
@RequiresPermissions(value={"workclientinfo:workClientInfo:view","workclientinfo:workClientInfo:add","workclientinfo:workClientInfo:edit"},logical=Logical.OR)
|
|
|
+ @RequestMapping(value = "formTwo")
|
|
|
+ public String formTwo(WorkClientInfo workClientInfo, Model model) {
|
|
|
+ model.addAttribute("workClientInfo", workClientInfo);
|
|
|
+ return "modules/workclientinfo/workClientInfoFormTwo";
|
|
|
+ }
|
|
|
+
|
|
|
+ //二次进行增加联系人类型
|
|
|
+ /*@RequiresPermissions(value={"workclientinfo:workClientInfo:view","workclientinfo:workClientInfo:add","workclientinfo:workClientInfo:edit"},logical=Logical.OR)
|
|
|
@RequestMapping(value = "type")
|
|
|
public String type(WorkClientInfo workClientInfo, Model model,String linkType) {
|
|
|
model.addAttribute("workClientInfo", workClientInfo);
|
|
|
model.addAttribute("linkType",linkType);
|
|
|
System.out.println("-----"+linkType);
|
|
|
return "modules/workclientinfo/workClientInfoFormType";
|
|
|
+ }*/
|
|
|
+
|
|
|
+ //二次进行增加联系人类型
|
|
|
+ @RequiresPermissions(value={"workclientinfo:workClientInfo:view","workclientinfo:workClientInfo:add","workclientinfo:workClientInfo:edit"},logical=Logical.OR)
|
|
|
+ @RequestMapping(value = "type")
|
|
|
+ public Object type(WorkClientInfo workClientInfo, Model model,String linkType) {
|
|
|
+ model.addAttribute("workClientInfo", workClientInfo);
|
|
|
+ model.addAttribute("linkType",linkType);
|
|
|
+ try {
|
|
|
+ if (!beanValidator(model, workClientInfo)){
|
|
|
+ return form(workClientInfo, model);
|
|
|
+ }
|
|
|
+ String typeStr = workClientInfo.getJobTypeStr();
|
|
|
+ typeStr=typeStr+","+linkType;
|
|
|
+ workClientInfo.setJobTypeStr(typeStr);
|
|
|
+ //保存当前人的公司
|
|
|
+ workClientInfo.setCompanyId(UserUtils.getSelectCompany().getId());
|
|
|
+ workClientInfo.setOfficeId(UserUtils.getSelectOffice().getId());
|
|
|
+ if(!workClientInfo.getIsNewRecord()){//编辑表单保存
|
|
|
+ WorkClientInfo t = workClientInfoService.get(workClientInfo.getId());//从数据库取出记录的值
|
|
|
+ MyBeanUtils.copyBeanNotNull2Bean(workClientInfo, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
|
|
|
+ workClientInfoService.save(t);//保存
|
|
|
+ }else{//新增表单保存
|
|
|
+ workClientInfoService.save(workClientInfo);//保存
|
|
|
+ }
|
|
|
+
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ System.out.println("-----"+linkType);
|
|
|
+ Map<String,Object> map = new HashMap<>();
|
|
|
+ return map;
|
|
|
+ }
|
|
|
+ //直接进行增加联系人类型
|
|
|
+ @RequiresPermissions(value={"workclientinfo:workClientInfo:view","workclientinfo:workClientInfo:add","workclientinfo:workClientInfo:edit"},logical=Logical.OR)
|
|
|
+ @RequestMapping(value = "typeAdd")
|
|
|
+ public String typeAdd(WorkClientInfo workClientInfo, Model model,String linkType) {
|
|
|
+ model.addAttribute("workClientInfo", workClientInfo);
|
|
|
+ model.addAttribute("linkType",linkType);
|
|
|
+ WorkClientLinkman linkman = workClientInfo.getWorkClientLinkmanList().get(0);
|
|
|
+ Map<String,Object> map = new HashMap<>();
|
|
|
+ map.put("id",linkman.getId());//联系人id
|
|
|
+ map.put("clientId",workClientInfo.getId());//客户id
|
|
|
+ map.put("clientName",workClientInfo.getName());
|
|
|
+ map.put("uscCode",workClientInfo.getUscCode());
|
|
|
+ map.put("linkName",linkman.getName());
|
|
|
+ map.put("linkMobile",linkman.getLinkMobile());
|
|
|
+ map.put("linkPhone",linkman.getLinkPhone());
|
|
|
+ //统一信用代码添加到WorkClientLinkman的统一信用代码里面
|
|
|
+ if(workClientInfo.getWorkClientLinkmanList().size()>0){
|
|
|
+ for( int i=0;i<workClientInfo.getWorkClientLinkmanList().size();i++){
|
|
|
+ workClientInfo.getWorkClientLinkmanList().get(i).setUscCode(workClientInfo.getUscCode());
|
|
|
+ workClientInfo.getWorkClientLinkmanList().get(i).getClientId().setUscCode(workClientInfo.getUscCode());
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ ProjectRecords projectRecords=new ProjectRecords();
|
|
|
+ if("1".equals(linkType)){
|
|
|
+ projectRecords.setWorkClientLinkmanList(workClientInfo.getWorkClientLinkmanList());
|
|
|
+ }else if("2".equals(linkType)){
|
|
|
+ projectRecords.setWorkBuildLinkmanList(workClientInfo.getWorkClientLinkmanList());
|
|
|
+ }else if("3".equals(linkType)){
|
|
|
+ projectRecords.setWorkConstructionLinkmanList(workClientInfo.getWorkClientLinkmanList());
|
|
|
+ }else if("4".equals(linkType)){
|
|
|
+ projectRecords.setWorkSuperLinkmanList(workClientInfo.getWorkClientLinkmanList());
|
|
|
+ }else if("5".equals(linkType)){
|
|
|
+ projectRecords.setWorkDesignLinkmanList(workClientInfo.getWorkClientLinkmanList());
|
|
|
+ }
|
|
|
+ model.addAttribute(projectRecords);
|
|
|
+ map.put("str","新增客户信息成功！");
|
|
|
+ System.out.println("-----"+linkType);
|
|
|
+ return "modules/projectrecord/projectRecordsForm";
|
|
|
+ /*return "redirect:"+Global.getAdminPath()+"/modules/projectrecord/projectRecordsForm/?repage";*/
|
|
|
}
|
|
|
|
|
|
/**
|
user7