傅行帆 3 年之前
父節點
當前提交
31e9da8907

+ 1
- 0
src/main/java/com/yunzhi/marketing/controller/ExtendContentController.java 查看文件

186
             extendContent.setContentType("nothing");
186
             extendContent.setContentType("nothing");
187
         }
187
         }
188
         extendContent.setCreateUser(getUserId(request));
188
         extendContent.setCreateUser(getUserId(request));
189
+        extendContent.setInstitutionId(getInstitutionId(request));
189
         responseBean = iExtendContentService.extendContentAdd(extendContent);
190
         responseBean = iExtendContentService.extendContentAdd(extendContent);
190
         responseBean.addSuccess(extendContent);
191
         responseBean.addSuccess(extendContent);
191
         return responseBean;
192
         return responseBean;

+ 1
- 0
src/main/java/com/yunzhi/marketing/controller/TaChannelController.java 查看文件

134
             int channelCode= taChannelMapper.channelCode();
134
             int channelCode= taChannelMapper.channelCode();
135
             channel.setChannelCode(String.valueOf(channelCode));
135
             channel.setChannelCode(String.valueOf(channelCode));
136
             channel.setOrgId(orgId);
136
             channel.setOrgId(orgId);
137
+            channel.setInstitutionId(getInstitutionId(request));
137
             if (taChannelService.save(channel)){
138
             if (taChannelService.save(channel)){
138
                 responseBean.addSuccess(channel);
139
                 responseBean.addSuccess(channel);
139
             }else {
140
             }else {

+ 5
- 0
src/main/java/com/yunzhi/marketing/entity/ExtendContent.java 查看文件

111
      */
111
      */
112
     @TableField(strategy = FieldStrategy.IGNORED)
112
     @TableField(strategy = FieldStrategy.IGNORED)
113
     private Integer orderNo;
113
     private Integer orderNo;
114
+
115
+    /**
116
+     * 组织机构code
117
+     */
118
+    private String institutionId;
114
 }
119
 }

+ 1
- 0
src/main/java/com/yunzhi/marketing/xlk/controller/CurriculumController.java 查看文件

115
             curriculum.setCreatedTime(LocalDateTime.now());
115
             curriculum.setCreatedTime(LocalDateTime.now());
116
             curriculum.setCreatedBy(getUserId(request));
116
             curriculum.setCreatedBy(getUserId(request));
117
             curriculum.setOrgId(getOrgId(request));
117
             curriculum.setOrgId(getOrgId(request));
118
+            curriculum.setInstitutionId(getInstitutionId(request));
118
             if (iCurriculumService.save(curriculum)){
119
             if (iCurriculumService.save(curriculum)){
119
                 responseBean.addSuccess(curriculum);
120
                 responseBean.addSuccess(curriculum);
120
             }else {
121
             }else {

+ 5
- 0
src/main/java/com/yunzhi/marketing/xlk/entity/Curriculum.java 查看文件

118
      */
118
      */
119
     @TableField(exist = false)
119
     @TableField(exist = false)
120
     private Boolean isSaved;
120
     private Boolean isSaved;
121
+
122
+    /**
123
+     * 组织机构code
124
+     */
125
+    private String institutionId;
121
 }
126
 }

+ 1
- 1
src/main/resources/mapper/xlk/PcStatisticsMapper.xml 查看文件

41
         FROM
41
         FROM
42
         ta_person tp
42
         ta_person tp
43
         where tp.org_id = #{params.orgId}
43
         where tp.org_id = #{params.orgId}
44
-        and tp.person_type = 'estate agent'
44
+        and tp.person_type in ('estate agent','channel agent')
45
     </select>
45
     </select>
46
     <select id="getUserOriginStatistics" resultType="com.yunzhi.marketing.xlk.vo.PcStatisticsVO">
46
     <select id="getUserOriginStatistics" resultType="com.yunzhi.marketing.xlk.vo.PcStatisticsVO">
47
         SELECT
47
         SELECT