用人单位

renren-admin/src/main/java/io/renren/modules/qmgj/api/ApiController.java

@@ -958,6 +958,12 @@ public class ApiController {
         return R.ok().put("list", list);
     }
 
+    @RequestMapping("wgclientinfo")
+    public R selectById(@RequestBody Map<String, Object> params) {
+        WgClientInfoEntity wgClientInfo = wgClientInfoService.getById(Long.valueOf(params.get("id").toString()));
+        return R.ok().put("data", wgClientInfo);
+    }
+
     private static boolean isNewDate(String registrationTime) {
         // Date registrationDate = DateUtil.parseDate(registrationTime,"yyyy-MM-dd HH:mm:ss");
         Date now;

renren-admin/src/main/java/io/renren/modules/qmgj/entity/WgClientInfoEntity.java

@@ -104,4 +104,21 @@ public class WgClientInfoEntity implements Serializable {
 	private String isDeleted;
 	@TableField(exist = false)
 	private String principal1;
+
+	/**
+	 * 注册时间
+	 */
+	private String registrationDate;
+	/**
+	 * 经营范围
+	 */
+	private String businessScope;
+	/**
+	 * 简介
+	 */
+	private String companyProfile;
+	/**
+	 * 运营内容
+	 */
+	private String operationsContent;
 }

renren-admin/src/main/java/io/renren/modules/qmgj/service/impl/WorkServiceImpl.java

@@ -560,6 +560,13 @@ public class WorkServiceImpl extends ServiceImpl<WorkDao, WorkEntity> implements
             work.setWorkAppletsDetailsList(activityAppletsDetailsList);
         }
         work.setReadNum(null);
+        //公司名
+        if (work.getClientId() != null) {
+            WgClientInfoEntity wgClientInfoEntity = wgClientInfoDao.selectById(work.getClientId());
+            if (wgClientInfoEntity != null) {
+                work.setClientName(wgClientInfoEntity.getCompanyname());
+            }
+        }
         workDao.updateById(work);
         return work;
     }

renren-admin/src/main/resources/mapper/qmgj/WgClientInfoDao.xml

@@ -23,10 +23,14 @@
         <result property="clientremark" column="clientRemark"/>
         <result property="inputuserid" column="inputUserid"/>
         <result property="toporgid" column="topOrgid"/>
+        <result property="registrationDate" column="registration_date"/>
+        <result property="businessScope" column="business_scope"/>
+        <result property="companyProfile" column="company_profile"/>
+        <result property="operationsContent" column="operations_content"/>
     </resultMap>
     <select id="selectWgClientInfo"  resultType="io.renren.modules.qmgj.entity.WgClientInfoEntity">
          SELECT
-                id,companyName,companyAdress,
+                id,companyName,companyAdress,registration_date,business_scope,company_profile,operations_content,
                 getItemName(65,industry) as industry,
                 `name`, phone, position,
                 getItemName(66,source) as source,

renren-admin/src/main/resources/templates/modules/qmgj/wgclientinfo.html

@@ -91,12 +91,30 @@
                     <textarea class="form-control" rows="4" v-model="wgClientInfo.companyadress" lay-verify="required" placeholder="公司地址"></textarea>
                 </div>
             </div>
-           <!-- <div class="form-group">
-                <div class="col-sm-2 control-label">负责人</div>
+            <div class="form-group">
+                <div class="col-sm-2 control-label">注册时间</div>
+                <div class="col-sm-4">
+                    <input type="text" class="form-control" v-model="wgClientInfo.registrationDate" lay-verify="required" placeholder="注册时间"/>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-sm-2 control-label">经营范围</div>
                 <div class="col-sm-4">
-                    <input type="text" class="form-control" v-model="wgClientInfo.principal" placeholder="负责人"/>
+                    <textarea class="form-control" rows="4" v-model="wgClientInfo.businessScope" lay-verify="required" placeholder="经营范围"></textarea>
                 </div>
-            </div>-->
+            </div>
+            <div class="form-group">
+                <div class="col-sm-2 control-label">企业简介</div>
+                <div class="col-sm-4">
+                    <textarea class="form-control" rows="4" v-model="wgClientInfo.companyProfile" lay-verify="required" placeholder="企业简介"></textarea>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-sm-2 control-label">运营内容</div>
+                <div class="col-sm-4">
+                    <textarea class="form-control" rows="4" v-model="wgClientInfo.operationsContent" lay-verify="required" placeholder="运营内容"></textarea>
+                </div>
+            </div>
             <div class="form-group">
                 <div class="col-sm-2 control-label">负责人</div>
                 <div class="col-sm-4">