Prechádzať zdrojové kódy

客户信息拆选添加 创建人选项

user5 4 rokov pred
rodič
commit
9a6d2302fe

+ 9 - 0
src/main/java/com/jeeplus/modules/workclientinfo/entity/WorkClientInfo.java

@@ -64,6 +64,7 @@ public class WorkClientInfo extends DataEntity<WorkClientInfo> {
 	private String errInfo;
 	private String unitIntroduction;
 	private String createName;   //创建人
+	private String createId;     //创建人id
 
 	private String jobTypeStr;
 
@@ -523,4 +524,12 @@ public class WorkClientInfo extends DataEntity<WorkClientInfo> {
 	public void setCreateName(String createName) {
 		this.createName = createName;
 	}
+
+	public String getCreateId() {
+		return createId;
+	}
+
+	public void setCreateId(String createId) {
+		this.createId = createId;
+	}
 }

+ 7 - 0
src/main/java/com/jeeplus/modules/workclientinfo/web/WorkClientInfoController.java

@@ -21,6 +21,7 @@ import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.sys.entity.Area;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
+import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.sysimportinfo.entity.SysImportInfo;
@@ -84,6 +85,11 @@ public class WorkClientInfoController extends BaseController {
 	@RequiresPermissions("workclientinfo:workClientInfo:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(WorkClientInfo workClientInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+
+		if(StringUtils.isNotBlank(workClientInfo.getCreateId())){
+			User selectUser = UserUtils.get(workClientInfo.getCreateId());
+			model.addAttribute("createName", selectUser.getName());
+		}
 		WorkClientLinkman workClientLinkman = workClientInfo.getWorkClientLinkman();
 		if(workClientLinkman != null){
 			workClientLinkman.setId("");
@@ -94,6 +100,7 @@ public class WorkClientInfoController extends BaseController {
 		}
 		Page<WorkClientInfo> page = workClientInfoService.findPage(new Page<WorkClientInfo>(request, response), workClientInfo);
 		model.addAttribute("page", page);
+		model.addAttribute("createId", workClientInfo.getCreateId());
 		return "modules/workclientinfo/workClientInfoList";
 	}
 

+ 6 - 0
src/main/resources/mappings/modules/workclientinfo/WorkClientInfoDao.xml

@@ -163,6 +163,9 @@
             <if test="endDate !=null">
                 AND a.create_date &lt; #{endDate}
             </if>
+			<if test="createId != null and createId != ''">
+				AND a.create_by = #{createId}
+			</if>
             AND a.company_id = #{currentUser.company.id}
 			and   c.job_type_id = '1'
 		</where>
@@ -225,6 +228,9 @@
             <if test="endDate !=null">
                 AND a.create_date &lt; #{endDate}
             </if>
+			<if test="createId != null and createId != ''">
+				AND a.create_by = #{createId}
+			</if>
             AND a.company_id = #{currentUser.company.id}
 			AND c.job_type_id = "1"
         </where>

+ 7 - 0
src/main/webapp/webpage/modules/workclientinfo/workClientInfoList.jsp

@@ -153,6 +153,13 @@
                                 <form:input path="uscCode" htmlEscape="false"  class="form-control layui-input"/>
 							</div>
 						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">创建人:</label>
+							<div class="layui-input-block  with-icon">
+								<sys:treeselect id="create" name="createId" value="${createId}" labelName="createNameStr" labelValue="${createName}"
+												title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+							</div>
+						</div>
 					</div>
 				</form:form>
 			</div>